<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[224535] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/224535">224535</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2017-11-07 10:10:40 -0800 (Tue, 07 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageLayoutContextcpp">trunk/Source/WebCore/page/LayoutContext.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleScopecpp">trunk/Source/WebCore/style/StyleScope.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleScopeh">trunk/Source/WebCore/style/StyleScope.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshadowdommediaqueryinshadowstyleexpectedhtml">trunk/LayoutTests/fast/shadow-dom/media-query-in-shadow-style-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdommediaqueryinshadowstylehtml">trunk/LayoutTests/fast/shadow-dom/media-query-in-shadow-style.html</a></li>
<li><a href="#trunkLayoutTestsfastshadowdomresourcesmediaqueryinshadowstyleframehtml">trunk/LayoutTests/fast/shadow-dom/resources/media-query-in-shadow-style-frame.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (224534 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2017-11-07 17:41:05 UTC (rev 224534)
+++ trunk/LayoutTests/ChangeLog 2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2017-11-07  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Support the case of fetch events that are not responded
</span></span></pre></div>
<a id="trunkLayoutTestsfastshadowdommediaqueryinshadowstyleexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/media-query-in-shadow-style-expected.html (0 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/media-query-in-shadow-style-expected.html                              (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/media-query-in-shadow-style-expected.html 2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<iframe src="data:text/html,<span style='color:red'>Text</span>" width=150 height=50></iframe><br>
+<iframe src="data:text/html,<span style='color:green'>Text</span>" width=300 height=50></iframe><br>
+<iframe src="data:text/html,<span style='color:red'>Text</span>" width=150 height=50></iframe><br>
+<iframe src="data:text/html,<span style='color:green'>Text</span>" width=300 height=50></iframe><br>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdommediaqueryinshadowstylehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/media-query-in-shadow-style.html (0 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/media-query-in-shadow-style.html                               (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/media-query-in-shadow-style.html  2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<iframe src=resources/media-query-in-shadow-style-frame.html width=150 height=50></iframe><br>
+<iframe src=resources/media-query-in-shadow-style-frame.html width=300 height=50></iframe><br>
+<iframe src=resources/media-query-in-shadow-style-frame.html width=300 height=50 onload='resize(event.target, 150)'></iframe><br>
+<iframe src=resources/media-query-in-shadow-style-frame.html width=150 height=50 onload='resize(event.target, 300)'></iframe><br>
+<script>
+if (window.testRunner)
+    testRunner.waitUntilDone();
+
+let resizeCount = 2;
+
+function resize(frame, size)
+{
+    setTimeout(() => {
+        frame.width = size;
+        if (!--resizeCount)
+            testRunner.notifyDone();
+    }, 10);
+}
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshadowdomresourcesmediaqueryinshadowstyleframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shadow-dom/resources/media-query-in-shadow-style-frame.html (0 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shadow-dom/resources/media-query-in-shadow-style-frame.html                               (rev 0)
+++ trunk/LayoutTests/fast/shadow-dom/resources/media-query-in-shadow-style-frame.html  2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<div id=test></div>
+<script>
+const shadow = test.attachShadow({mode: 'open'});
+shadow.innerHTML = `
+    <style>
+    @media (min-width:200px) {
+        div { color: green }
+    }
+    @media (max-width:200px) {
+        div { color: red }
+    }
+    </style>
+    <div>Text</div>
+`;
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (224534 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-11-07 17:41:05 UTC (rev 224534)
+++ trunk/Source/WebCore/ChangeLog      2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-11-07  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Release-assert NoEventDispatchAssertion in canExecute, updateLayout, and updateStyle
</span></span></pre></div>
<a id="trunkSourceWebCorepageLayoutContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/LayoutContext.cpp (224534 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/LayoutContext.cpp      2017-11-07 17:41:05 UTC (rev 224534)
+++ trunk/Source/WebCore/page/LayoutContext.cpp 2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -479,13 +479,8 @@
</span><span class="cx"> {
</span><span class="cx">     Document& document = *frame().document();
</span><span class="cx">     // Viewport-dependent media queries may cause us to need completely different style information.
</span><del>-    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);
-    }
</del><ins>+    document.styleScope().evaluateMediaQueriesForViewportChange();
+
</ins><span class="cx">     document.evaluateMediaQueryList();
</span><span class="cx">     // If there is any pagination to apply, it will affect the RenderView's style, so we should
</span><span class="cx">     // take care of that now.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (224534 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp       2017-11-07 17:41:05 UTC (rev 224534)
+++ trunk/Source/WebCore/page/Page.cpp  2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -2280,23 +2280,12 @@
</span><span class="cx"> 
</span><span class="cx"> void Page::accessibilitySettingsDidChange()
</span><span class="cx"> {
</span><del>-    bool neededRecalc = false;
-
</del><span class="cx">     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><del>-        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);
-            }
</del><ins>+        if (auto* document = frame->document()) {
+            document->styleScope().evaluateMediaQueriesForAccessibilitySettingsChange();
+            document->evaluateMediaQueryList();
</ins><span class="cx">         }
</span><span class="cx">     }
</span><del>-
-    if (neededRecalc)
-        LOG(Layout, "hasMediaQueriesAffectedByAccessibilitySettingsChange, enqueueing style recalc");
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Page::setUnobscuredSafeAreaInsets(const FloatBoxExtent& insets)
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleScope.cpp (224534 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleScope.cpp        2017-11-07 17:41:05 UTC (rev 224534)
+++ trunk/Source/WebCore/style/StyleScope.cpp   2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -600,6 +600,36 @@
</span><span class="cx">     m_pendingUpdateTimer.startOneShot(0_s);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+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);
+}
+
</ins><span class="cx"> void Scope::didChangeActiveStyleSheetCandidates()
</span><span class="cx"> {
</span><span class="cx">     scheduleUpdate(UpdateType::ActiveSet);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleScope.h (224534 => 224535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleScope.h  2017-11-07 17:41:05 UTC (rev 224534)
+++ trunk/Source/WebCore/style/StyleScope.h     2017-11-07 18:10:40 UTC (rev 224535)
</span><span class="lines">@@ -97,6 +97,9 @@
</span><span class="cx"> 
</span><span class="cx">     bool activeStyleSheetsContains(const CSSStyleSheet*) const;
</span><span class="cx"> 
</span><ins>+    void evaluateMediaQueriesForViewportChange();
+    void evaluateMediaQueriesForAccessibilitySettingsChange();
+
</ins><span class="cx">     // This is called when some stylesheet becomes newly enabled or disabled.
</span><span class="cx">     void didChangeActiveStyleSheetCandidates();
</span><span class="cx">     // This is called when contents of a stylesheet is mutated.
</span><span class="lines">@@ -130,6 +133,8 @@
</span><span class="cx">     void updateActiveStyleSheets(UpdateType);
</span><span class="cx">     void scheduleUpdate(UpdateType);
</span><span class="cx"> 
</span><ins>+    template <typename TestFunction> void evaluateMediaQueries(TestFunction&&);
+
</ins><span class="cx">     WEBCORE_EXPORT void flushPendingSelfUpdate();
</span><span class="cx">     WEBCORE_EXPORT void flushPendingDescendantUpdates();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>