DevTools: do not abuse inspector controller for the front-end side plumbing.

Source/web/WebDevToolsFrontendImpl.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "web/WebDevToolsFrontendImpl.h"
 
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/V8DevToolsHost.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/DevToolsHost.h"
-#include "core/inspector/InspectorController.h"
-#include "core/page/Page.h"
 #include "public/platform/WebString.h"
 #include "public/web/WebDevToolsFrontendClient.h"
+#include "public/web/WebSecurityOrigin.h"
+#include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
 
 WebDevToolsFrontend* WebDevToolsFrontend::create(
-    WebView* view,
+    WebLocalFrame* frame,
     WebDevToolsFrontendClient* client,
     const WebString& applicationLocale)
 {
-    return new WebDevToolsFrontendImpl(toWebViewImpl(view), client);
+    return new WebDevToolsFrontendImpl(toWebLocalFrameImpl(frame), client);
 }
 
 WebDevToolsFrontendImpl::WebDevToolsFrontendImpl(
-    WebViewImpl* webViewImpl,
+    WebLocalFrameImpl* webFrame,
     WebDevToolsFrontendClient* client)
-    : m_webViewImpl(webViewImpl)
+    : m_webFrame(webFrame)
     , m_client(client)
 {
-    m_webViewImpl->page()->inspectorController().setInspectorFrontendClient(this);
+    m_webFrame->setDevToolsFrontend(this);
 }
 
 WebDevToolsFrontendImpl::~WebDevToolsFrontendImpl()
 {
     ASSERT(!m_devtoolsHost);
 }
 
-void WebDevToolsFrontendImpl::dispose()
+void WebDevToolsFrontendImpl::didClearWindowObject(WebLocalFrameImpl* frame)
 {
-    if (m_devtoolsHost) {
-        m_devtoolsHost->disconnectClient();
-        m_devtoolsHost = nullptr;
+    if (m_webFrame == frame) {
+        v8::Isolate* isolate = v8::Isolate::GetCurrent();
+        ScriptState* scriptState = ScriptState::forMainWorld(m_webFrame->frame());
+        ScriptState::Scope scope(scriptState);
+
+        if (m_devtoolsHost)
+            m_devtoolsHost->disconnectClient();
+        m_devtoolsHost = DevToolsHost::create(this, m_webFrame->frame());
+        v8::Handle<v8::Object> global = scriptState->context()->Global();
+        v8::Handle<v8::Value> devtoolsHostObj = toV8(m_devtoolsHost.get(), global, scriptState->isolate());
+        global->Set(v8::String::NewFromUtf8(isolate, "DevToolsHost"), devtoolsHostObj);
     }
-    m_client = 0;
-}
 
-void WebDevToolsFrontendImpl::windowObjectCleared()
-{
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
-    Page* page = m_webViewImpl->page();
-    ASSERT(page->mainFrame());
-    ScriptState* scriptState = ScriptState::forMainWorld(page->deprecatedLocalMainFrame());
-    ScriptState::Scope scope(scriptState);
+    if (m_injectedScriptForOrigin.isEmpty())
+        return;
 
-    if (m_devtoolsHost)
-        m_devtoolsHost->disconnectClient();
-    m_devtoolsHost = DevToolsHost::create(this, page);
-    v8::Handle<v8::Object> global = scriptState->context()->Global();
-    v8::Handle<v8::Value> devtoolsHostObj = toV8(m_devtoolsHost.get(), global, scriptState->isolate());
-    global->Set(v8::String::NewFromUtf8(isolate, "DevToolsHost"), devtoolsHostObj);
+    String origin = frame->securityOrigin().toString();
+    String script = m_injectedScriptForOrigin.get(origin);
+    if (!script.isEmpty())
+        frame->frame()->script().executeScriptInMainWorld(script + "()");
 }
 
 void WebDevToolsFrontendImpl::sendMessageToBackend(const String& message)
 {
     if (m_client)
         m_client->sendMessageToBackend(message);
 }
 
 void WebDevToolsFrontendImpl::sendMessageToEmbedder(const String& message)
 {
     if (m_client)
         m_client->sendMessageToEmbedder(message);
 }
 
 bool WebDevToolsFrontendImpl::isUnderTest()
 {
     return m_client ? m_client->isUnderTest() : false;
 }
 
+void WebDevToolsFrontendImpl::showContextMenu(float x, float y, PassRefPtrWillBeRawPtr<ContextMenuProvider> menuProvider)
+{
+    m_webFrame->viewImpl()->showContextMenuAtPoint(x, y, menuProvider);
+}
+
+void WebDevToolsFrontendImpl::setInjectedScriptForOrigin(const String& origin, const String& source)
+{
+    m_injectedScriptForOrigin.set(origin, source);
+}
+
 } // namespace blink