Title: [245386] branches/safari-608.1.24-branch/Source/WebCore
- Revision
- 245386
- Author
- [email protected]
- Date
- 2019-05-15 22:43:36 -0700 (Wed, 15 May 2019)
Log Message
Cherry-pick r245368. rdar://problem/49833954
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().
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245368 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.1.24-branch/Source/WebCore/ChangeLog (245385 => 245386)
--- branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 05:43:34 UTC (rev 245385)
+++ branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 05:43:36 UTC (rev 245386)
@@ -1,5 +1,42 @@
2019-05-15 Kocsen Chung <[email protected]>
+ Cherry-pick r245368. rdar://problem/49833954
+
+ 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().
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245368 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-05-15 Timothy Hatcher <[email protected]>
+
+ 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 Kocsen Chung <[email protected]>
+
Cherry-pick r245320. rdar://problem/48737122
Web Automation: elements larger than the viewport have incorrect in-view center point
Modified: branches/safari-608.1.24-branch/Source/WebCore/dom/Document.cpp (245385 => 245386)
--- branches/safari-608.1.24-branch/Source/WebCore/dom/Document.cpp 2019-05-16 05:43:34 UTC (rev 245385)
+++ branches/safari-608.1.24-branch/Source/WebCore/dom/Document.cpp 2019-05-16 05:43:36 UTC (rev 245386)
@@ -6894,10 +6894,9 @@
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
@@ -6938,6 +6937,13 @@
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;
@@ -6945,6 +6951,8 @@
options.add(StyleColor::Options::UseSystemAppearance);
if (useDarkAppearance(style))
options.add(StyleColor::Options::UseDarkAppearance);
+ if (useInactiveAppearance())
+ options.add(StyleColor::Options::UseInactiveAppearance);
return options;
}
Modified: branches/safari-608.1.24-branch/Source/WebCore/dom/Document.h (245385 => 245386)
--- branches/safari-608.1.24-branch/Source/WebCore/dom/Document.h 2019-05-16 05:43:34 UTC (rev 245385)
+++ branches/safari-608.1.24-branch/Source/WebCore/dom/Document.h 2019-05-16 05:43:36 UTC (rev 245386)
@@ -568,6 +568,7 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
