Changeset 224535 in webkit

Timestamp:

Nov 7, 2017 10:10:40 AM (6 years ago)

Author:

Antti Koivisto

Message:

Dynamic media queries don't update in shadow tree stylesheets
​https://bugs.webkit.org/show_bug.cgi?id=179324

Reviewed by Ryosuke Niwa.

Source/WebCore:

Viewport and accessibility queries should work dynamically also in shadow trees.

Test: fast/shadow-dom/media-query-in-shadow-style.html

• page/LayoutContext.cpp:

(WebCore::LayoutContext::updateStyleForLayout):

• page/Page.cpp:

(WebCore::Page::accessibilitySettingsDidChange):

Evaluate media query list (JS API) unconditionally as it is independent from style queries.
Remove some logging.

• style/StyleScope.cpp:

(WebCore::Style::Scope::evaluateMediaQueriesForViewportChange):
(WebCore::Style::Scope::evaluateMediaQueriesForAccessibilitySettingsChange):

Factor into functions in style scope.

(WebCore::Style::Scope::evaluateMediaQueries):

Evaluate queries in all shadow trees too.

• style/StyleScope.h:

LayoutTests:

• fast/shadow-dom/media-query-in-shadow-style-expected.html: Added.
• fast/shadow-dom/media-query-in-shadow-style.html: Added.
• fast/shadow-dom/resources/media-query-in-shadow-style-frame.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/media-query-in-shadow-style-expected.html (added)
• LayoutTests/fast/shadow-dom/media-query-in-shadow-style.html (added)
• LayoutTests/fast/shadow-dom/resources/media-query-in-shadow-style-frame.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/LayoutContext.cpp (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (1 diff)
• Source/WebCore/style/StyleScope.cpp (modified) (1 diff)
• Source/WebCore/style/StyleScope.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-11-07  Antti Koivisto  <antti@apple.com>
+
+        Dynamic media queries don't update in shadow tree stylesheets
+        https://bugs.webkit.org/show_bug.cgi?id=179324
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/shadow-dom/media-query-in-shadow-style-expected.html: Added.
+        * fast/shadow-dom/media-query-in-shadow-style.html: Added.
+        * fast/shadow-dom/resources/media-query-in-shadow-style-frame.html: Added.
+
 2017-11-07  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-07  Antti Koivisto  <antti@apple.com>
+
+        Dynamic media queries don't update in shadow tree stylesheets
+        https://bugs.webkit.org/show_bug.cgi?id=179324
+
+        Reviewed by Ryosuke Niwa.
+
+        Viewport and accessibility queries should work dynamically also in shadow trees.
+
+        Test: fast/shadow-dom/media-query-in-shadow-style.html
+
+        * page/LayoutContext.cpp:
+        (WebCore::LayoutContext::updateStyleForLayout):
+        * page/Page.cpp:
+        (WebCore::Page::accessibilitySettingsDidChange):
+
+            Evaluate media query list (JS API) unconditionally as it is independent from style queries.
+            Remove some logging.
+
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::evaluateMediaQueriesForViewportChange):
+        (WebCore::Style::Scope::evaluateMediaQueriesForAccessibilitySettingsChange):
+
+            Factor into functions in style scope.
+
+        (WebCore::Style::Scope::evaluateMediaQueries):
+
+            Evaluate queries in all shadow trees too.
+
+        * style/StyleScope.h:
+
 2017-11-07  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/page/LayoutContext.cpp

@@ -480 +480 @@
     Document& document = *frame().document();
     // Viewport-dependent media queries may cause us to need completely different style information.
-    auto* styleResolver = document.styleScope().resolverIfExists();
-    if (!styleResolver || styleResolver->hasMediaQueriesAffectedByViewportChange()) {
-        LOG(Layout, "  hasMediaQueriesAffectedByViewportChange, enqueueing style recalc");
-        document.styleScope().didChangeStyleSheetEnvironment();
-        // FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
-        InspectorInstrumentation::mediaQueryResultChanged(document);
-    }
+    document.styleScope().evaluateMediaQueriesForViewportChange();
+
     document.evaluateMediaQueryList();
     // If there is any pagination to apply, it will affect the RenderView's style, so we should

trunk/Source/WebCore/page/Page.cpp

@@ -2281 +2281 @@
 void Page::accessibilitySettingsDidChange()
 {
-    bool neededRecalc = false;
-
-    for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
-        if (Document* document = frame->document()) {
-            auto* styleResolver = document->styleScope().resolverIfExists();
-            if (styleResolver && styleResolver->hasMediaQueriesAffectedByAccessibilitySettingsChange()) {
-                document->styleScope().didChangeStyleSheetEnvironment();
-                document->evaluateMediaQueryList();
-                neededRecalc = true;
-                // FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
-                InspectorInstrumentation::mediaQueryResultChanged(*document);
-            }
+    for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
+        if (auto* document = frame->document()) {
+            document->styleScope().evaluateMediaQueriesForAccessibilitySettingsChange();
+            document->evaluateMediaQueryList();
         }
     }
-
-    if (neededRecalc)
-        LOG(Layout, "hasMediaQueriesAffectedByAccessibilitySettingsChange, enqueueing style recalc");
 }
 

trunk/Source/WebCore/style/StyleScope.cpp

@@ -601 +601 @@
 }
 
+void Scope::evaluateMediaQueriesForViewportChange()
+{
+    evaluateMediaQueries([] (StyleResolver& resolver) {
+        return resolver.hasMediaQueriesAffectedByViewportChange();
+    });
+}
+
+void Scope::evaluateMediaQueriesForAccessibilitySettingsChange()
+{
+    evaluateMediaQueries([] (StyleResolver& resolver) {
+        return resolver.hasMediaQueriesAffectedByAccessibilitySettingsChange();
+    });
+}
+
+template <typename TestFunction>
+void Scope::evaluateMediaQueries(TestFunction&& testFunction)
+{
+    if (!m_shadowRoot) {
+        for (auto* descendantShadowRoot : m_document.inDocumentShadowRoots())
+            descendantShadowRoot->styleScope().evaluateMediaQueries(testFunction);
+    }
+    auto* resolver = resolverIfExists();
+    if (!resolver)
+        return;
+    if (!testFunction(*resolver))
+        return;
+    scheduleUpdate(UpdateType::ContentsOrInterpretation);
+    InspectorInstrumentation::mediaQueryResultChanged(m_document);
+}
+
 void Scope::didChangeActiveStyleSheetCandidates()
 {

trunk/Source/WebCore/style/StyleScope.h

@@ -98 +98 @@
     bool activeStyleSheetsContains(const CSSStyleSheet*) const;
 
+    void evaluateMediaQueriesForViewportChange();
+    void evaluateMediaQueriesForAccessibilitySettingsChange();
+
     // This is called when some stylesheet becomes newly enabled or disabled.
     void didChangeActiveStyleSheetCandidates();
@@ -131 +134 @@
     void scheduleUpdate(UpdateType);
 
+    template <typename TestFunction> void evaluateMediaQueries(TestFunction&&);
+
     WEBCORE_EXPORT void flushPendingSelfUpdate();
     WEBCORE_EXPORT void flushPendingDescendantUpdates();