Changeset 173688 in webkit

Timestamp:

Sep 17, 2014 1:54:50 AM (10 years ago)

Author:

Yusuke Suzuki

Message:

filterRootById accidentally clears inAdjacentChain flag
​https://bugs.webkit.org/show_bug.cgi?id=136851

Reviewed by Benjamin Poulain.

Source/WebCore:

Test: fast/selectors/filter-root-node-with-selector-contains-adjacents.html

• dom/SelectorQuery.cpp:

(WebCore::filterRootById):

LayoutTests:

When SubSelector comes, inAdjacentChain flag is cleared to false.
So for example, document.querySelector("span#id + ok") doesn't work correctly.
In this patch, we handles SubSelector relation correctly; don't change inAdjacentChain flag
to filter the right search root node.

• fast/selectors/filter-root-node-with-selector-contains-adjacents-expected.txt: Added.
• fast/selectors/filter-root-node-with-selector-contains-adjacents.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents-expected.txt (added)
• LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/SelectorQuery.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-09-16  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        filterRootById accidentally clears inAdjacentChain flag
+        https://bugs.webkit.org/show_bug.cgi?id=136851
+
+        Reviewed by Benjamin Poulain.
+
+        When SubSelector comes, `inAdjacentChain` flag is cleared to false.
+        So for example, `document.querySelector("span#id + ok")` doesn't work correctly.
+        In this patch, we handles SubSelector relation correctly; don't change `inAdjacentChain` flag
+        to filter the right search root node.
+
+        * fast/selectors/filter-root-node-with-selector-contains-adjacents-expected.txt: Added.
+        * fast/selectors/filter-root-node-with-selector-contains-adjacents.html: Added.
+
 2014-09-16  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-16  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        filterRootById accidentally clears inAdjacentChain flag
+        https://bugs.webkit.org/show_bug.cgi?id=136851
+
+        Reviewed by Benjamin Poulain.
+
+        Test: fast/selectors/filter-root-node-with-selector-contains-adjacents.html
+
+        * dom/SelectorQuery.cpp:
+        (WebCore::filterRootById):
+
 2014-09-16  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/dom/SelectorQuery.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2011, 2013, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Yusuke Suzuki <utatane.tea@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -244 +245 @@
             }
         }
+        if (selector->relation() == CSSSelector::SubSelector)
+            continue;
         if (selector->relation() == CSSSelector::DirectAdjacent || selector->relation() == CSSSelector::IndirectAdjacent)
             inAdjacentChain = true;
@@ -584 +587 @@
     if (m_entries.size() == maximumSelectorQueryCacheSize)
         m_entries.remove(m_entries.begin());
-    
+
     return m_entries.add(selectors, std::make_unique<SelectorQuery>(WTF::move(selectorList))).iterator->value.get();
 }