Changeset 56393 in webkit

Timestamp:

Mar 23, 2010 8:14:29 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-03-23 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Element inspector search funtion: Error dispatching: performSearch.

​https://bugs.webkit.org/show_bug.cgi?id=36488

Test: inspector/elements-panel-search.html

• inspector/front-end/ElementsPanel.js: (WebInspector.ElementsPanel.prototype.performSearch): (WebInspector.ElementsPanel.prototype.addNodesToSearchResult):
• inspector/front-end/InjectedScript.js: (injectedScriptConstructor.): (injectedScriptConstructor):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/elements-panel-search-expected.txt (added)
• LayoutTests/inspector/elements-panel-search.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/front-end/ElementsPanel.js (modified) (1 diff)
• WebCore/inspector/front-end/InjectedScript.js (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-23  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Element inspector search funtion: Error dispatching: performSearch.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36488
+
+        * inspector/elements-panel-search-expected.txt: Added.
+        * inspector/elements-panel-search.html: Added.
+
 2010-03-23  Qi Zhang  <qi.2.zhang@nokia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-23  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Element inspector search funtion: Error dispatching: performSearch.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36488
+
+        Test: inspector/elements-panel-search.html
+
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype.performSearch):
+        (WebInspector.ElementsPanel.prototype.addNodesToSearchResult):
+        * inspector/front-end/InjectedScript.js:
+        (injectedScriptConstructor.):
+        (injectedScriptConstructor):
+
 2010-03-23  Qi Zhang  <qi.2.zhang@nokia.com>
 

trunk/WebCore/inspector/front-end/ElementsPanel.js

@@ -254 +254 @@
         this._searchQuery = query;
 
-        InjectedScriptAccess.getDefault().performSearch(whitespaceTrimmedQuery, function() {});
+        InjectedScriptAccess.getDefault().performSearch(whitespaceTrimmedQuery, false, function() {});
     },
 

trunk/WebCore/inspector/front-end/InjectedScript.js

@@ -311 +311 @@
 }
 
-InjectedScript.performSearch = function(whitespaceTrimmedQuery)
+InjectedScript.performSearch = function(whitespaceTrimmedQuery, runSynchronously)
 {
     // FIXME: Few things are missing here:
@@ -479 +479 @@
 
     // Find all frames, iframes and object elements to search their documents.
-    const querySelectorAllFunction = InjectedScript._window().Document.prototype.querySelectorAll;
-    const subdocumentResult = querySelectorAllFunction.call(mainFrameDocument, "iframe, frame, object");
+    const subdocumentResult = mainFrameDocument.querySelectorAll("iframe, frame, object");
 
     for (var i = 0; i < subdocumentResult.length; ++i) {
@@ -509 +508 @@
                 clearInterval(chunkIntervalIdentifier);
                 finishedSearching.call(panel);
-                return;
+                return false;
             }
 
             searchDocument = searchDocuments[documentIndex];
         }
-
-        if (!searchDocument || !searchFunction)
-            return;
 
         try {
@@ -523 +519 @@
             // ignore any exceptions. the query might be malformed, but we allow that.
         }
-    }
-
-    processChunk();
-
-    chunkIntervalIdentifier = setInterval(processChunk, 25);
-    InjectedScript._currentSearchChunkIntervalIdentifier = chunkIntervalIdentifier;
+        return true;
+    }
+
+    if (runSynchronously)
+        while (processChunk()) {}
+    else {
+        processChunk();
+        chunkIntervalIdentifier = setInterval(processChunk, 25);
+        InjectedScript._currentSearchChunkIntervalIdentifier = chunkIntervalIdentifier;
+    }
     return true;
 }