DevTools: Activate inspector window on break / exception.

webkit/glue/webdevtoolsclient_impl.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include <string>
 
 #include "Document.h"
 #include "DOMWindow.h"
@@ skipping 81 matching lines @@
     return;
   }
   v8::HandleScope scope;
   v8::Local<v8::FunctionTemplate> local_template =
       v8::FunctionTemplate::New(V8Proxy::CheckNewLegal);
   host_template_ = v8::Persistent<v8::FunctionTemplate>::New(local_template);
 
   v8::Local<v8::Signature> default_signature =
       v8::Signature::New(host_template_);
   v8::Local<v8::ObjectTemplate> proto = host_template_->PrototypeTemplate();
-  proto->Set(
-      v8::String::New("addSourceToFrame"),
-      v8::FunctionTemplate::New(
-          WebDevToolsClientImpl::JsAddSourceToFrame,
-          v8::Handle<v8::Value>(),
-          default_signature),
-      static_cast<v8::PropertyAttribute>(v8::DontDelete));
-  proto->Set(
-      v8::String::New("loaded"),
-      v8::FunctionTemplate::New(
-          WebDevToolsClientImpl::JsLoaded,
-          v8::Handle<v8::Value>(),
-          default_signature),
-      static_cast<v8::PropertyAttribute>(v8::DontDelete));
-  proto->Set(
-      v8::String::New("search"),
-      v8::FunctionTemplate::New(
-          WebDevToolsClientImpl::JsSearch,
-          v8::Handle<v8::Value>(),
-          default_signature),
-      static_cast<v8::PropertyAttribute>(v8::DontDelete));
+  InitProtoFunction(proto,
+                    "addSourceToFrame",
+                    WebDevToolsClientImpl::JsAddSourceToFrame,
+                    default_signature);
+  InitProtoFunction(proto,
+                    "loaded",
+                    WebDevToolsClientImpl::JsLoaded,
+                    default_signature);
+  InitProtoFunction(proto,
+                    "search",
+                    WebCore::V8Custom::v8InspectorControllerSearchCallback,
+                    default_signature);
+  InitProtoFunction(proto,
+                    "activateWindow",
+                    WebDevToolsClientImpl::JsActivateWindow,
+                    default_signature);
   host_template_->SetClassName(v8::String::New("DevToolsHost"));
 }
 
 // static
+void WebDevToolsClientImpl::InitProtoFunction(
+    v8::Handle<v8::ObjectTemplate> proto,
+    const char* name,
+    v8::InvocationCallback callback,
+    v8::Handle<v8::Signature> signature) {
+  proto->Set(
+      v8::String::New(name),
+      v8::FunctionTemplate::New(
+          callback,
+          v8::Handle<v8::Value>(),
+          signature),
+      static_cast<v8::PropertyAttribute>(v8::DontDelete));
+}
+
+// static
 WebDevToolsClient* WebDevToolsClient::Create(
     WebView* view,
     WebDevToolsClientDelegate* delegate) {
   return new WebDevToolsClientImpl(static_cast<WebViewImpl*>(view), delegate);
 }
 
 WebDevToolsClientImpl::WebDevToolsClientImpl(
     WebViewImpl* web_view_impl,
     WebDevToolsClientDelegate* delegate)
     : web_view_impl_(web_view_impl),
@@ skipping 96 matching lines @@
            client->pending_incoming_messages_.begin();
        it != client->pending_incoming_messages_.end();
        ++it) {
     client->DispatchMessageFromAgent(*it);
   }
   client->pending_incoming_messages_.clear();
   return v8::Undefined();
 }
 
 // static
-v8::Handle<v8::Value> WebDevToolsClientImpl::JsSearch(
+v8::Handle<v8::Value> WebDevToolsClientImpl::JsActivateWindow(
     const v8::Arguments& args) {
-  return WebCore::V8Custom::v8InspectorControllerSearchCallback(args);
+  Page* page = V8Proxy::retrieveActiveFrame()->page();
+  WebDevToolsClientImpl* client = page_to_client_.get(page);
+  client->delegate_->ActivateWindow();
+  return v8::Undefined();
 }