Changeset 202104 in webkit

Timestamp:

Jun 15, 2016 1:52:14 PM (8 years ago)

Author:

Antti Koivisto

Message:

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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt (modified) (1 diff)
• LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html (modified) (2 diffs)
• LayoutTests/fast/css/style-invalidation-class-change-descendants-expected.txt (modified) (1 diff)
• LayoutTests/fast/css/style-invalidation-class-change-descendants.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/DocumentRuleSets.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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:
+
 2016-06-15  Javier Fernandez  <jfernandez@igalia.com>
 

trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants-expected.txt

@@ -160 +160 @@
 PASS testStyleChangeType("inert", "NoStyleChange") is true
 PASS hasExpectedStyle is true
+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
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/css/style-invalidation-attribute-change-descendants.html

@@ -49 +49 @@
 [myattr=value11] target {
     color: rgb(11, 0, 0);
+}
+
+[myattr3] notarget {
+    color: rgb(99, 0, 0);
 }
 
@@ -260 +264 @@
 checkStyle(11);
 
+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);
+
 </script>
 <script src="../../resources/js-test-post.js"></script>

trunk/LayoutTests/fast/css/style-invalidation-class-change-descendants-expected.txt

@@ -63 +63 @@
 PASS testStyleChangeType("inert", "NoStyleChange") is true
 PASS hasExpectedStyle is true
+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
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/css/style-invalidation-class-change-descendants.html

@@ -25 +25 @@
 root:not(.style5) target {
     color: rgb(5, 5, 5);
+}
+
+root.dynamicStyle notTarget {
+    color: rgb(99, 99, 99);
 }
 
@@ -158 +162 @@
 checkStyle(0);
 
+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)
+
 </script>
 <script src="../../resources/js-test-post.js"></script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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).
+
 2016-06-15  Javier Fernandez  <jfernandez@igalia.com>
 

trunk/Source/WebCore/css/DocumentRuleSets.cpp

@@ -115 +115 @@
     m_siblingRuleSet = makeRuleSet(m_features.siblingRules);
     m_uncommonAttributeRuleSet = makeRuleSet(m_features.uncommonAttributeRules);
+
+    m_ancestorClassRuleSets.clear();
+    m_ancestorAttributeRuleSetsForHTML.clear();
 }