2011-03-15 Pavel Feldman <pfeldman@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: crash upon "//html//@id" search in elements panel.
        https://bugs.webkit.org/show_bug.cgi?id=56334

        * inspector/elements/elements-panel-search-expected.txt:
        * inspector/elements/elements-panel-search.html:
2011-03-15  Pavel Feldman  <pfeldman@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: crash upon "//html//@id" search in elements panel.
        https://bugs.webkit.org/show_bug.cgi?id=56334

        * inspector/InspectorDOMAgent.cpp:
        * inspector/front-end/ElementsTreeOutline.js:

git-svn-id: svn://svn.chromium.org/blink/trunk@81132 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/ChangeLog

+2011-03-15  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: crash upon "//html//@id" search in elements panel.
+        https://bugs.webkit.org/show_bug.cgi?id=56334
+
+        * inspector/elements/elements-panel-search-expected.txt:
+        * inspector/elements/elements-panel-search.html:
+
 2011-03-15  Andrey Kosyakov  <caseq@chromium.org>
 
         Unreviewed. Swap two calls to setMonitoringXHREnabled to get rid of side effects on other tests.

third_party/WebKit/LayoutTests/inspector/elements/elements-panel-search-expected.txt

@@ -11,4 +11,5 @@ FooBar
 <input value="InputVal">
 <input value="InputVal">
 <input value="InputVal">
+<div attr="foo"></div>
 

third_party/WebKit/LayoutTests/inspector/elements/elements-panel-search.html

@@ -52,6 +52,8 @@ function test()
         WebInspector.domAgent.performSearch("In" + "putVa" + "l", addNodesToSearchResult, true);
         // Partial attribute val<>ue.
         WebInspector.domAgent.performSearch("n" + "putVa" + "l", addNodesToSearchResult, true);
+        // XPath attribute.
+        WebInspector.domAgent.performSearch("//html" + "//@attr", addNodesToSearchResult, true);
         // Terminator.
         WebInspector.domAgent.performSearch("ter" + "mi" + "nator", addNodesToSearchResult, true);
     }
@@ -66,6 +68,7 @@ Tests that elements panel search is returning proper results.
 
 <div>FooBar</div>
 <input value="InputVal">
+<div attr="foo"></div>
 <div id="terminator"></div>
 
 </body>

third_party/WebKit/Source/WebCore/ChangeLog

+2011-03-15  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: crash upon "//html//@id" search in elements panel.
+        https://bugs.webkit.org/show_bug.cgi?id=56334
+
+        * inspector/InspectorDOMAgent.cpp:
+        * inspector/front-end/ElementsTreeOutline.js:
+
 2011-03-15  Andrey Kosyakov  <caseq@chromium.org>
 
         Reviewed by Yury Semikhatsky.

third_party/WebKit/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -206,8 +206,12 @@ public:
         unsigned long size = result->snapshotLength(ec);
         for (unsigned long i = 0; !ec && i < size; ++i) {
             Node* node = result->snapshotItem(i, ec);
-            if (!ec)
-                resultCollector.add(node);
+            if (ec)
+                break;
+
+            if (node->nodeType() == Node::ATTRIBUTE_NODE)
+                node = static_cast<Attr*>(node)->ownerElement();
+            resultCollector.add(node);
         }
 #else
         UNUSED_PARAM(resultCollector);

third_party/WebKit/Source/WebCore/inspector/front-end/ElementsTreeOutline.js

@@ -1492,6 +1492,11 @@ WebInspector.ElementsTreeElement.prototype = {
             matchRanges.push({ offset: match.index, length: match[0].length });
             match = regexObject.exec(text);
         }
+
+        // Fall back for XPath, etc. matches.
+        if (!matchRanges.length)
+            matchRanges.push({ offset: 0, length: text.length });
+
         highlightSearchResults(this.listItemElement, matchRanges);
         this._searchHighlightedHTML = this.listItemElement.innerHTML;
     }