Changeset 116755 in webkit

Timestamp:

May 11, 2012 5:47:57 AM (12 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: Search box doesn't allow CSS selectors anymore
​https://bugs.webkit.org/show_bug.cgi?id=86196

Reviewed by Pavel Feldman.

Source/WebCore:

Refactoring in ​http://trac.webkit.org/changeset/99983 inadvertently removed the selector matching during
node search in the InspectorDOMAgent. This change re-introduces the Document::querySelectorAll() evaluation
for the user query.

• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::performSearch):

LayoutTests:

• inspector/elements/elements-panel-search-expected.txt:
• inspector/elements/elements-panel-search.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/elements/elements-panel-search-expected.txt (modified) (2 diffs)
• LayoutTests/inspector/elements/elements-panel-search.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorDOMAgent.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-11  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: Search box doesn't allow CSS selectors anymore
+        https://bugs.webkit.org/show_bug.cgi?id=86196
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/elements/elements-panel-search-expected.txt:
+        * inspector/elements/elements-panel-search.html:
+
 2012-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/inspector/elements/elements-panel-search-expected.txt

@@ -3 +3 @@
 FooBar
 
+Found by selector
 
 Running: testSetUp
@@ -30 +31 @@
 < d i v   a t t r = " f o o " > < / d i v >
 
+Running: testSelector
+< s p a n > F o u n d   b y   s e l e c t o r < / s p a n >
+

trunk/LayoutTests/inspector/elements/elements-panel-search.html

@@ -72 +72 @@
         {
             WebInspector.domAgent.performSearch("//html" + "//@attr", searchCallback.bind(this, next));
+        },
+
+        function testSelector(next)
+        {
+            WebInspector.domAgent.performSearch("d" + "iv.divclass span", searchCallback.bind(this, next));
         }
     ]);
@@ -88 +93 @@
 <div attr="foo"></div>
 <div id="terminator"></div>
+<div class="divclass"><span>Found by selector</span></div>
 
 </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-11  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: Search box doesn't allow CSS selectors anymore
+        https://bugs.webkit.org/show_bug.cgi?id=86196
+
+        Reviewed by Pavel Feldman.
+
+        Refactoring in http://trac.webkit.org/changeset/99983 inadvertently removed the selector matching during
+        node search in the InspectorDOMAgent. This change re-introduces the Document::querySelectorAll() evaluation
+        for the user query.
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::performSearch):
+
 2012-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -885 +885 @@
             }
         }
+
+        // Selector evaluation
+        for (Vector<Document*>::iterator it = docs.begin(); it != docs.end(); ++it) {
+            Document* document = *it;
+            ExceptionCode ec = 0;
+            RefPtr<NodeList> nodeList = document->querySelectorAll(whitespaceTrimmedQuery, ec);
+            if (ec || !nodeList)
+                continue;
+
+            unsigned size = nodeList->length();
+            for (unsigned i = 0; i < size; ++i)
+                resultCollector.add(nodeList->item(i));
+        }
     }