Attachment 370006 Details for Bug 197930 – Patch

[patch] Patch

bug-197930-20190515160916.patch (text/plain), 3.22 KB, created by Timothy Hatcher on 2019-05-15 16:09:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2019-05-15 16:09:17 PDT

Size: 3.22 KB

patch

obsolete

>Subversion Revision: 245337
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 44db6ae85ba3c10cdab90d6609c2d38296eb15e0..d3b932f95285405aa5cb41c8a30c984dd833eb2f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-05-15  Timothy Hatcher  <timothy@apple.com>
>+
>+        REGRESSION (r245072): Missing code in Document::styleColorOptions to propagate StyleColor::Options::UseInactiveAppearance
>+        https://bugs.webkit.org/show_bug.cgi?id=197930
>+        rdar://problem/49833954
>+
>+        Reviewed by Wenson Hsieh and Megan Gardner.
>+
>+        Add some code that was missing from Document in my original patch for r245072.
>+
>+        * dom/Document.cpp:
>+        (WebCore::Document::useSystemAppearance const): Drive-by fix code style.
>+        (WebCore::Document::useInactiveAppearance const): Added.
>+        (WebCore::Document::styleColorOptions const): Add StyleColor::Options::UseInactiveAppearance.
>+        * dom/Document.h: Added useInactiveAppearance().
>+
> 2019-05-15  Youenn Fablet  <youenn@apple.com>
> 
>         getUserMedia sandbox extensions should not be revoked when a getUserMedia allowed request is being processed
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index a2fbd8fdc8a6cec210aee04cbafb9eca45e80f49..cecd76662be651396dc78512daf2fd3114e2d927 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -6891,10 +6891,9 @@ float Document::deviceScaleFactor() const
> 
> bool Document::useSystemAppearance() const
> {
>-    bool useSystemAppearance = false;
>-    if (Page* documentPage = page())
>-        useSystemAppearance = documentPage->useSystemAppearance();
>-    return useSystemAppearance;
>+    if (auto* documentPage = page())
>+        return documentPage->useSystemAppearance();
>+    return false;
> }
> 
> bool Document::useDarkAppearance(const RenderStyle* style) const
>@@ -6935,6 +6934,13 @@ bool Document::useDarkAppearance(const RenderStyle* style) const
>     return false;
> }
> 
>+bool Document::useInactiveAppearance() const
>+{
>+    if (auto* documentPage = page())
>+        return documentPage->useInactiveAppearance();
>+    return false;
>+}
>+
> OptionSet<StyleColor::Options> Document::styleColorOptions(const RenderStyle* style) const
> {
>     OptionSet<StyleColor::Options> options;
>@@ -6942,6 +6948,8 @@ OptionSet<StyleColor::Options> Document::styleColorOptions(const RenderStyle* st
>         options.add(StyleColor::Options::UseSystemAppearance);
>     if (useDarkAppearance(style))
>         options.add(StyleColor::Options::UseDarkAppearance);
>+    if (useInactiveAppearance())
>+        options.add(StyleColor::Options::UseInactiveAppearance);
>     return options;
> }
> 
>diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
>index 135ef0b6cd8ce5515ce471eac2023ffa8e48757b..971fe4ce82b9148dccd99cc426060052ac8533c5 100644
>--- a/Source/WebCore/dom/Document.h
>+++ b/Source/WebCore/dom/Document.h
>@@ -567,6 +567,7 @@ public:
>     float deviceScaleFactor() const;
> 
>     WEBCORE_EXPORT bool useSystemAppearance() const;
>+    WEBCORE_EXPORT bool useInactiveAppearance() const;
>     WEBCORE_EXPORT bool useDarkAppearance(const RenderStyle*) const;
> 
>     OptionSet<StyleColor::Options> styleColorOptions(const RenderStyle*) const;

Actions: View | Formatted Diff | Diff

Attachments on bug 197930: 370002 | 370006