Highlight node with mouse over it while selecting element to inspect

BUG=20969
TEST=none

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

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

5 files changed, 9 insertions, 17 deletions

diff --git a/webkit/api/public/WebDevToolsFrontendClient.h b/webkit/api/public/WebDevToolsFrontendClient.h
index 0c8397c..f2a6c4c 100644
--- a/webkit/api/public/WebDevToolsFrontendClient.h
+++ b/webkit/api/public/WebDevToolsFrontendClient.h
@@ -50,7 +50,6 @@ public:
     virtual void closeWindow() = 0;
     virtual void dockWindow() = 0;
     virtual void undockWindow() = 0;
-    virtual void toggleInspectElementMode(bool enabled) = 0;
 
 protected:
     virtual ~WebDevToolsFrontendClient() {}
diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js
index 0a452e2..0b41054 100644
--- a/webkit/glue/devtools/js/devtools.js
+++ b/webkit/glue/devtools/js/devtools.js
@@ -445,3 +445,11 @@ InjectedScriptAccess.getCompletions = function(expressionString,
 };
 })();
 
+
+(function() {
+WebInspector.ElementsPanel.prototype._nodeSearchButtonClicked = function(
+    event) {
+  InspectorController.toggleNodeSearch();
+  this.nodeSearchButton.toggled = !this.nodeSearchButton.toggled;
+};
+})();
\ No newline at end of file
diff --git a/webkit/glue/devtools/js/inspector_controller_impl.js b/webkit/glue/devtools/js/inspector_controller_impl.js
index 6b341b3..0758ad2 100644
--- a/webkit/glue/devtools/js/inspector_controller_impl.js
+++ b/webkit/glue/devtools/js/inspector_controller_impl.js
@@ -95,7 +95,7 @@ devtools.InspectorControllerImpl.prototype.search = function(sourceRow, query) {
  */
 devtools.InspectorControllerImpl.prototype.toggleNodeSearch = function() {
   devtools.InspectorController.prototype.toggleNodeSearch.call(this);
-  DevToolsHost.toggleInspectElementMode(this.searchingForNode());
+  this.callInspectorController_.call(this, 'toggleNodeSearch');
 };
 
 
diff --git a/webkit/glue/webdevtoolsfrontend_impl.cc b/webkit/glue/webdevtoolsfrontend_impl.cc
index 0cee5b5..8f8a10d 100644
--- a/webkit/glue/webdevtoolsfrontend_impl.cc
+++ b/webkit/glue/webdevtoolsfrontend_impl.cc
@@ -176,9 +176,6 @@ WebDevToolsFrontendImpl::WebDevToolsFrontendImpl(
       "undockWindow",
       WebDevToolsFrontendImpl::JsUndockWindow);
   dev_tools_host_->AddProtoFunction(
-      "toggleInspectElementMode",
-      WebDevToolsFrontendImpl::JsToggleInspectElementMode);
-  dev_tools_host_->AddProtoFunction(
       "getApplicationLocale",
       WebDevToolsFrontendImpl::JsGetApplicationLocale);
   dev_tools_host_->AddProtoFunction(
@@ -389,16 +386,6 @@ v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsUndockWindow(
 }
 
 // static
-v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsToggleInspectElementMode(
-    const v8::Arguments& args) {
-  WebDevToolsFrontendImpl* frontend = static_cast<WebDevToolsFrontendImpl*>(
-      v8::External::Cast(*args.Data())->Value());
-  int enabled = static_cast<int>(args[0]->BooleanValue());
-  frontend->client_->toggleInspectElementMode(enabled);
-  return v8::Undefined();
-}
-
-// static
 v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsGetApplicationLocale(
     const v8::Arguments& args) {
   WebDevToolsFrontendImpl* frontend = static_cast<WebDevToolsFrontendImpl*>(
diff --git a/webkit/glue/webdevtoolsfrontend_impl.h b/webkit/glue/webdevtoolsfrontend_impl.h
index 94e6bc0..6ad02e2 100644
--- a/webkit/glue/webdevtoolsfrontend_impl.h
+++ b/webkit/glue/webdevtoolsfrontend_impl.h
@@ -74,8 +74,6 @@ class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend,
   static v8::Handle<v8::Value> JsCloseWindow(const v8::Arguments& args);
   static v8::Handle<v8::Value> JsDockWindow(const v8::Arguments& args);
   static v8::Handle<v8::Value> JsUndockWindow(const v8::Arguments& args);
-  static v8::Handle<v8::Value> JsToggleInspectElementMode(
-      const v8::Arguments& args);
   static v8::Handle<v8::Value> JsGetApplicationLocale(
       const v8::Arguments& args);
   static v8::Handle<v8::Value> JsHiddenPanels(