<!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>[204792] releases/WebKitGTK/webkit-2.12</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/204792">204792</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-23 03:05:25 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/202104">r202104</a> - GoogleMaps transit schedule explorer comes up blank initially
https://bugs.webkit.org/show_bug.cgi?id=158803
rdar://problem/25818080
Source/WebCore:
Reviewed by Andreas Kling.
In case we had something like
.foo bar { ... }
and later a new stylesheet was added dynamically that contained
.foo baz { ... }
we would fail to add the new rules to the descendant invalidation rule sets for ".foo". This could
cause some style invalidations to be missed.
* css/DocumentRuleSets.cpp:
(WebCore::DocumentRuleSets::collectFeatures):
Reset the ancestorClassRules and ancestorAttributeRulesForHTML rule set caches when new style sheets
are added (==collectFeatures is called).
LayoutTests:
Reviewed by Andreas Kling
Expand the tests to cover this case.
* fast/css/style-invalidation-attribute-change-descendants-expected.txt:
* fast/css/style-invalidation-attribute-change-descendants.html:
* fast/css/style-invalidation-class-change-descendants-expected.txt:
* fast/css/style-invalidation-class-change-descendants.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssstyleinvalidationattributechangedescendantsexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssstyleinvalidationattributechangedescendantshtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssstyleinvalidationclasschangedescendantsexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-class-change-descendants-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastcssstyleinvalidationclasschangedescendantshtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-class-change-descendants.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorecssDocumentRuleSetscpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/css/DocumentRuleSets.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (204791 => 204792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 09:57:31 UTC (rev 204791)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 10:05:25 UTC (rev 204792)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-15 Antti Koivisto <antti@apple.com>
+
+ GoogleMaps transit schedule explorer comes up blank initially
+ https://bugs.webkit.org/show_bug.cgi?id=158803
+ rdar://problem/25818080
+
+ Reviewed by Andreas Kling
+
+ Expand the tests to cover this case.
+
+ * fast/css/style-invalidation-attribute-change-descendants-expected.txt:
+ * fast/css/style-invalidation-attribute-change-descendants.html:
+ * fast/css/style-invalidation-class-change-descendants-expected.txt:
+ * fast/css/style-invalidation-class-change-descendants.html:
+
</ins><span class="cx"> 2016-06-02 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a couple of mistakes in CSSParserValue memory management
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssstyleinvalidationattributechangedescendantsexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt (204791 => 204792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt 2016-08-23 09:57:31 UTC (rev 204791)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt 2016-08-23 10:05:25 UTC (rev 204792)
</span><span class="lines">@@ -159,6 +159,27 @@
</span><span class="cx"> PASS testStyleChangeType("target", "InlineStyleChange") is true
</span><span class="cx"> PASS testStyleChangeType("inert", "NoStyleChange") is true
</span><span class="cx"> PASS hasExpectedStyle is true
</span><ins>+Setting attribute 'myattr3' value ''
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "NoStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
+Removing attribute 'myattr3'
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "NoStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
+Inserting stylesheet '[myattr3] target { color:rgb(12, 0, 0); }'
+Setting attribute 'myattr3' value ''
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "InlineStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
+Removing attribute 'myattr3'
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "InlineStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssstyleinvalidationattributechangedescendantshtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html (204791 => 204792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html 2016-08-23 09:57:31 UTC (rev 204791)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html 2016-08-23 10:05:25 UTC (rev 204792)
</span><span class="lines">@@ -50,6 +50,10 @@
</span><span class="cx"> color: rgb(11, 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+[myattr3] notarget {
+ color: rgb(99, 0, 0);
+}
+
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -259,6 +263,27 @@
</span><span class="cx"> testStyleInvalidation("InlineStyleChange");
</span><span class="cx"> checkStyle(11);
</span><span class="cx">
</span><ins>+setAttribute('myattr3', '');
+testStyleInvalidation("NoStyleChange");
+checkStyle(11);
+
+removeAttribute('myattr3');
+testStyleInvalidation("NoStyleChange");
+checkStyle(11);
+
+var dynamicSheet = document.createElement("style");
+dynamicSheet.innerHTML = "[myattr3] target { color:rgb(12, 0, 0); }"
+debug("Inserting stylesheet '" + dynamicSheet.innerHTML + "'");
+document.head.appendChild(dynamicSheet);
+
+setAttribute('myattr3', '');
+testStyleInvalidation("InlineStyleChange");
+checkStyle(12);
+
+removeAttribute('myattr3');
+testStyleInvalidation("InlineStyleChange");
+checkStyle(11);
+
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssstyleinvalidationclasschangedescendantsexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-class-change-descendants-expected.txt (204791 => 204792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-class-change-descendants-expected.txt 2016-08-23 09:57:31 UTC (rev 204791)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-class-change-descendants-expected.txt 2016-08-23 10:05:25 UTC (rev 204792)
</span><span class="lines">@@ -62,6 +62,27 @@
</span><span class="cx"> PASS testStyleChangeType("target", "InlineStyleChange") is true
</span><span class="cx"> PASS testStyleChangeType("inert", "NoStyleChange") is true
</span><span class="cx"> PASS hasExpectedStyle is true
</span><ins>+Adding class dynamicStyle
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "NoStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
+Removing class dynamicStyle
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "NoStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
+Inserting stylesheet 'root.dynamicStyle target { color:rgb(6, 6, 6); }'
+Adding class dynamicStyle
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "InlineStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
+Removing class dynamicStyle
+PASS testStyleChangeType("root", "NoStyleChange") || testStyleChangeType("root", "InlineStyleChange") is true
+PASS testStyleChangeType("target", "InlineStyleChange") is true
+PASS testStyleChangeType("inert", "NoStyleChange") is true
+PASS hasExpectedStyle is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastcssstyleinvalidationclasschangedescendantshtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-class-change-descendants.html (204791 => 204792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-class-change-descendants.html 2016-08-23 09:57:31 UTC (rev 204791)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/css/style-invalidation-class-change-descendants.html 2016-08-23 10:05:25 UTC (rev 204792)
</span><span class="lines">@@ -26,6 +26,10 @@
</span><span class="cx"> color: rgb(5, 5, 5);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+root.dynamicStyle notTarget {
+ color: rgb(99, 99, 99);
+}
+
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -157,6 +161,27 @@
</span><span class="cx"> testStyleInvalidation("InlineStyleChange");
</span><span class="cx"> checkStyle(0);
</span><span class="cx">
</span><ins>+addClass('dynamicStyle');
+testStyleInvalidation("NoStyleChange");
+checkStyle(0);
+
+removeClass('dynamicStyle');
+testStyleInvalidation("NoStyleChange");
+checkStyle(0)
+
+var dynamicSheet = document.createElement("style");
+dynamicSheet.innerHTML = "root.dynamicStyle target { color:rgb(6, 6, 6); }"
+debug("Inserting stylesheet '" + dynamicSheet.innerHTML + "'");
+document.head.appendChild(dynamicSheet);
+
+addClass('dynamicStyle');
+testStyleInvalidation("InlineStyleChange");
+checkStyle(6);
+
+removeClass('dynamicStyle');
+testStyleInvalidation("InlineStyleChange");
+checkStyle(0)
+
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204791 => 204792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 09:57:31 UTC (rev 204791)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 10:05:25 UTC (rev 204792)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-06-15 Antti Koivisto <antti@apple.com>
+
+ GoogleMaps transit schedule explorer comes up blank initially
+ https://bugs.webkit.org/show_bug.cgi?id=158803
+ rdar://problem/25818080
+
+ Reviewed by Andreas Kling.
+
+ In case we had something like
+
+ .foo bar { ... }
+
+ and later a new stylesheet was added dynamically that contained
+
+ .foo baz { ... }
+
+ we would fail to add the new rules to the descendant invalidation rule sets for ".foo". This could
+ cause some style invalidations to be missed.
+
+ * css/DocumentRuleSets.cpp:
+ (WebCore::DocumentRuleSets::collectFeatures):
+
+ Reset the ancestorClassRules and ancestorAttributeRulesForHTML rule set caches when new style sheets
+ are added (==collectFeatures is called).
+
</ins><span class="cx"> 2016-06-02 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a couple of mistakes in CSSParserValue memory management
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorecssDocumentRuleSetscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/css/DocumentRuleSets.cpp (204791 => 204792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/css/DocumentRuleSets.cpp 2016-08-23 09:57:31 UTC (rev 204791)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/css/DocumentRuleSets.cpp 2016-08-23 10:05:25 UTC (rev 204792)
</span><span class="lines">@@ -114,6 +114,9 @@
</span><span class="cx">
</span><span class="cx"> m_siblingRuleSet = makeRuleSet(m_features.siblingRules);
</span><span class="cx"> m_uncommonAttributeRuleSet = makeRuleSet(m_features.uncommonAttributeRules);
</span><ins>+
+ m_ancestorClassRuleSets.clear();
+ m_ancestorAttributeRuleSetsForHTML.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RuleSet* DocumentRuleSets::ancestorClassRules(AtomicStringImpl* className) const
</span></span></pre>
</div>
</div>
</body>
</html>