Changeset 166808 in webkit

Timestamp:

Apr 4, 2014 3:30:44 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

Upgrade to SelectorFailsAllSiblings when Child selector is failed.
​https://bugs.webkit.org/show_bug.cgi?id=130961

Patch by Yusuke Suzuki <Yusuke Suzuki> on 2014-04-04
Reviewed by Benjamin Poulain.

When Child selector fails, we should resume matching from the closest
Descendant selector.
So upgrading SelectorFailsLocally to SelectorFailsAllSibling at least
to prevent unnecessary direct/indirect adjacent selectors matching.

• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::matchRecursively):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/SelectorChecker.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-04  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Upgrade to SelectorFailsAllSiblings when Child selector is failed.
+        https://bugs.webkit.org/show_bug.cgi?id=130961
+
+        Reviewed by Benjamin Poulain.
+
+        When Child selector fails, we should resume matching from the closest
+        Descendant selector.
+        So upgrading SelectorFailsLocally to SelectorFailsAllSibling at least
+        to prevent unnecessary direct/indirect adjacent selectors matching.
+
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::matchRecursively):
+
 2014-04-04  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -212 +212 @@
 
     case CSSSelector::Child:
-        nextContext.element = context.element->parentElement();
-        if (!nextContext.element)
-            return SelectorFailsCompletely;
-        nextContext.isSubSelector = false;
-        nextContext.elementStyle = 0;
-        return matchRecursively(nextContext, ignoreDynamicPseudo);
+        {
+            nextContext.element = context.element->parentElement();
+            if (!nextContext.element)
+                return SelectorFailsCompletely;
+            nextContext.isSubSelector = false;
+            nextContext.elementStyle = nullptr;
+            Match match = matchRecursively(nextContext, ignoreDynamicPseudo);
+            if (match == SelectorMatches || match == SelectorFailsCompletely)
+                return match;
+            return SelectorFailsAllSiblings;
+        }
 
     case CSSSelector::DirectAdjacent: