DevTools: Implement search in scripts.

Review URL: http://codereview.chromium.org/100332

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15206 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 41 insertions, 2 deletions

diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index 1432a08..430b9e0 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -420,9 +420,9 @@ WebInspector.SourceView.prototype.setupSourceFrameIfNeeded = function() {
         self.sourceFrame.addEventListener('syntax highlighting complete',
             self._syntaxHighlightingComplete, self);
         self.sourceFrame.syntaxHighlightJavascript();
+      } else {
+        self._sourceFrameSetupFinished();
       }
-    } else {
-      self._sourceFrameSetupFinished();
     }
   });
   return true;
@@ -593,6 +593,37 @@ WebInspector.StylePropertyTreeElement.prototype.applyStyleText = function(
 
 
 /**
+ * This function overrides standard searchableViews getters to perform search
+ * only in the current view (other views are loaded asynchronously, no way to
+ * search them yet).
+ */
+WebInspector.searchableViews_ = function() {
+  var views = [];
+  const visibleView = this.visibleView;
+  if (visibleView && visibleView.performSearch) {
+    views.push(visibleView);
+  }
+  return views;
+};
+
+
+/**
+ * @override
+ */
+WebInspector.ResourcesPanel.prototype.__defineGetter__(
+    'searchableViews',
+    WebInspector.searchableViews_);
+
+
+/**
+ * @override
+ */
+WebInspector.ScriptsPanel.prototype.__defineGetter__(
+    'searchableViews',
+    WebInspector.searchableViews_);
+
+
+/**
  * @override
  */
 WebInspector.Console.prototype._evalInInspectedWindow = function(expression) {
diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js
index 8871675..45abbe2 100644
--- a/webkit/glue/devtools/js/inspector_controller_impl.js
+++ b/webkit/glue/devtools/js/inspector_controller_impl.js
@@ -36,6 +36,14 @@ devtools.InspectorControllerImpl.prototype.hiddenPanels = function() {
 /**
  * {@inheritDoc}.
  */
+devtools.InspectorController.prototype.search = function(sourceRow, query) {
+  return DevToolsHost.search(sourceRow, query);
+};
+
+
+/**
+ * {@inheritDoc}.
+ */
 devtools.InspectorControllerImpl.prototype.addSourceToFrame =
     function(mimeType, source, element) {
   return DevToolsHost.addSourceToFrame(mimeType, source, element);