Attachment 370002 Details for Bug 197930 – Patch

[patch] Patch

bug-197930-20190515155540.patch (text/plain), 2.65 KB, created by Timothy Hatcher on 2019-05-15 15:55:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2019-05-15 15:55:41 PDT

Size: 2.65 KB

patch

obsolete

>Subversion Revision: 245337
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 44db6ae85ba3c10cdab90d6609c2d38296eb15e0..3c296e9de46f71348ec26f8511b097b99bb2c113 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        Add some code that was missing from Document in my original patch for r245072.
>+
>+        * dom/Document.cpp:
>+        (WebCore::Document::useInactiveAppearance const):
>+        (WebCore::Document::styleColorOptions const):
>+        * dom/Document.h:
>+
> 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..1f156ace2a90cf8e23a011e13b41dacbdead0bf5 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -6935,6 +6935,14 @@ bool Document::useDarkAppearance(const RenderStyle* style) const
>     return false;
> }
> 
>+bool Document::useInactiveAppearance() const
>+{
>+    bool useInactiveAppearance = false;
>+    if (Page* documentPage = page())
>+        useInactiveAppearance = documentPage->useInactiveAppearance();
>+    return useInactiveAppearance;
>+}
>+
> OptionSet<StyleColor::Options> Document::styleColorOptions(const RenderStyle* style) const
> {
>     OptionSet<StyleColor::Options> options;
>@@ -6942,6 +6950,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