Changeset 245664 in webkit

Timestamp:

May 22, 2019, 5:43:09 PM (7 years ago)

Author:

Antti Koivisto

Message:

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.

Location:

trunk

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)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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-22  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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-22  Saam barati  <sbarati@apple.com>
 

trunk/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;