Changeset 245927 in webkit

Timestamp:

May 30, 2019, 5:30:20 PM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r245664. rdar://problem/51264774

Subselectors not searched when determining property whitelist for selector
​https://bugs.webkit.org/show_bug.cgi?id=198147
<rdar://problem/50405208>

Reviewed by Zalan Bujtas.

Source/WebCore:

This can cause marker elements get style they shouldn't.

Test: fast/lists/marker-style-subselector-whitelist.html

• css/RuleSet.cpp: (WebCore::determinePropertyWhitelistType):

Check subselectors too.

LayoutTests:

• fast/lists/marker-style-subselector-whitelist-expected.txt: Added.
• fast/lists/marker-style-subselector-whitelist.html: Added.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@245664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/lists/marker-style-subselector-whitelist-expected.txt (added)
• LayoutTests/fast/lists/marker-style-subselector-whitelist.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/RuleSet.cpp (modified) (1 diff)

branches/safari-607-branch/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r245664. rdar://problem/51264774
+
+    Subselectors not searched when determining property whitelist for selector
+    https://bugs.webkit.org/show_bug.cgi?id=198147
+    <rdar://problem/50405208>
+    
+    Reviewed by Zalan Bujtas.
+    
+    Source/WebCore:
+    
+    This can cause marker elements get style they shouldn't.
+    
+    Test: fast/lists/marker-style-subselector-whitelist.html
+    
+    * css/RuleSet.cpp:
+    (WebCore::determinePropertyWhitelistType):
+    
+    Check subselectors too.
+    
+    LayoutTests:
+    
+    * fast/lists/marker-style-subselector-whitelist-expected.txt: Added.
+    * fast/lists/marker-style-subselector-whitelist.html: Added.
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245664 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-22  Antti Koivisto  <antti@apple.com>
+
+            Subselectors not searched when determining property whitelist for selector
+            https://bugs.webkit.org/show_bug.cgi?id=198147
+            <rdar://problem/50405208>
+
+            Reviewed by Zalan Bujtas.
+
+            * fast/lists/marker-style-subselector-whitelist-expected.txt: Added.
+            * fast/lists/marker-style-subselector-whitelist.html: Added.
+
 2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r245664. rdar://problem/51264774
+
+    Subselectors not searched when determining property whitelist for selector
+    https://bugs.webkit.org/show_bug.cgi?id=198147
+    <rdar://problem/50405208>
+    
+    Reviewed by Zalan Bujtas.
+    
+    Source/WebCore:
+    
+    This can cause marker elements get style they shouldn't.
+    
+    Test: fast/lists/marker-style-subselector-whitelist.html
+    
+    * css/RuleSet.cpp:
+    (WebCore::determinePropertyWhitelistType):
+    
+    Check subselectors too.
+    
+    LayoutTests:
+    
+    * fast/lists/marker-style-subselector-whitelist-expected.txt: Added.
+    * fast/lists/marker-style-subselector-whitelist.html: Added.
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245664 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-22  Antti Koivisto  <antti@apple.com>
+
+            Subselectors not searched when determining property whitelist for selector
+            https://bugs.webkit.org/show_bug.cgi?id=198147
+            <rdar://problem/50405208>
+
+            Reviewed by Zalan Bujtas.
+
+            This can cause marker elements get style they shouldn't.
+
+            Test: fast/lists/marker-style-subselector-whitelist.html
+
+            * css/RuleSet.cpp:
+            (WebCore::determinePropertyWhitelistType):
+
+            Check subselectors too.
+
 2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebCore/css/RuleSet.cpp

@@ -145 +145 @@
         if (component->match() == CSSSelector::PseudoElement && component->pseudoElementType() == CSSSelector::PseudoElementMarker)
             return PropertyWhitelistMarker;
+
+        if (const auto* selectorList = selector->selectorList()) {
+            for (const auto* subSelector = selectorList->first(); subSelector; subSelector = CSSSelectorList::next(subSelector)) {
+                auto whitelistType = determinePropertyWhitelistType(subSelector);
+                if (whitelistType != PropertyWhitelistNone)
+                    return whitelistType;
+            }
+        }
     }
     return PropertyWhitelistNone;