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

Source/core/inspector/DevToolsHost.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 22 matching lines @@
 #include "bindings/core/v8/ScriptFunctionCall.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/clipboard/Pasteboard.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/Event.h"
 #include "core/events/EventTarget.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/parser/TextResourceDecoder.h"
-#include "core/inspector/InspectorController.h"
 #include "core/inspector/InspectorFrontendClient.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/loader/FrameLoader.h"
 #include "core/page/ContextMenuController.h"
 #include "core/page/ContextMenuProvider.h"
 #include "core/page/Page.h"
 #include "platform/ContextMenu.h"
 #include "platform/ContextMenuItem.h"
 #include "platform/SharedBuffer.h"
 #include "platform/UserGestureIndicator.h"
@@ skipping 66 matching lines @@
         , m_items(items)
     {
     }
 
     RawPtrWillBeMember<DevToolsHost> m_devtoolsHost;
     ScriptValue m_devtoolsApiObject;
 
     Vector<ContextMenuItem> m_items;
 };
 
-DevToolsHost::DevToolsHost(InspectorFrontendClient* client, Page* frontendPage)
+DevToolsHost::DevToolsHost(InspectorFrontendClient* client, LocalFrame* frontendFrame)
     : m_client(client)
-    , m_frontendPage(frontendPage)
+    , m_frontendFrame(frontendFrame)
     , m_menuProvider(nullptr)
 {
 }
 
 DevToolsHost::~DevToolsHost()
 {
     ASSERT(!m_client);
 }
 
 void DevToolsHost::trace(Visitor* visitor)
 {
-    visitor->trace(m_frontendPage);
+    visitor->trace(m_frontendFrame);
     visitor->trace(m_menuProvider);
 }
 
 void DevToolsHost::disconnectClient()
 {
     m_client = 0;
     if (m_menuProvider) {
         m_menuProvider->disconnect();
         m_menuProvider = nullptr;
     }
-    m_frontendPage = nullptr;
+    m_frontendFrame = nullptr;
 }
 
 float DevToolsHost::zoomFactor()
 {
-    if (!m_frontendPage)
-        return 1;
-    if (LocalFrame* frame = m_frontendPage->deprecatedLocalMainFrame())
-        return frame->pageZoomFactor();
-    return 1;
+    return m_frontendFrame ? m_frontendFrame->pageZoomFactor() : 1;
 }
 
 void DevToolsHost::setInjectedScriptForOrigin(const String& origin, const String& script)
 {
-    if (!m_frontendPage)
-        return;
-    m_frontendPage->inspectorController().setInjectedScriptForOrigin(origin, script);
+    if (m_client)
+        m_client->setInjectedScriptForOrigin(origin, script);
 }
 
 void DevToolsHost::copyText(const String& text)
 {
     Pasteboard::generalPasteboard()->writePlainText(text, Pasteboard::CannotSmartReplace);
 }
 
 static String escapeUnicodeNonCharacters(const String& str)
 {
     const UChar nonChar = 0xD800;
@@ skipping 24 matching lines @@
     if (m_client)
         m_client->sendMessageToBackend(escapeUnicodeNonCharacters(message));
 }
 
 void DevToolsHost::sendMessageToEmbedder(const String& message)
 {
     if (m_client)
         m_client->sendMessageToEmbedder(escapeUnicodeNonCharacters(message));
 }
 
-void DevToolsHost::showContextMenu(Page* page, float x, float y, const Vector<ContextMenuItem>& items)
+void DevToolsHost::showContextMenu(float x, float y, const Vector<ContextMenuItem>& items)
 {
-    ASSERT(m_frontendPage);
-    ScriptState* frontendScriptState = ScriptState::forMainWorld(m_frontendPage->deprecatedLocalMainFrame());
+    ASSERT(m_frontendFrame);
+    ScriptState* frontendScriptState = ScriptState::forMainWorld(m_frontendFrame);
     ScriptValue devtoolsApiObject = frontendScriptState->getFromGlobalObject("DevToolsAPI");
     ASSERT(devtoolsApiObject.isObject());
 
     RefPtrWillBeRawPtr<FrontendMenuProvider> menuProvider = FrontendMenuProvider::create(this, devtoolsApiObject, items);
     m_menuProvider = menuProvider.get();
-    float zoom = page->deprecatedLocalMainFrame()->pageZoomFactor();
-    page->inspectorController().showContextMenu(x * zoom, y * zoom, menuProvider);

[dgozman, 2015/02/03 20:38:08]

This |page| was used to display context menu in toolbox page, which differs from
|m_frontendPage|.

[pfeldman, 2015/02/04 06:50:15]

Done.

+    float zoom = m_frontendFrame->pageZoomFactor();
+    if (m_client)
+        m_client->showContextMenu(x * zoom, y * zoom, menuProvider);
 }
 
 void DevToolsHost::showContextMenu(Event* event, const Vector<ContextMenuItem>& items)
 {
     if (!event)
         return;
 
-    ASSERT(m_frontendPage);
-    ScriptState* frontendScriptState = ScriptState::forMainWorld(m_frontendPage->deprecatedLocalMainFrame());
+    ASSERT(m_frontendFrame);
+    ScriptState* frontendScriptState = ScriptState::forMainWorld(m_frontendFrame);
     ScriptValue devtoolsApiObject = frontendScriptState->getFromGlobalObject("DevToolsAPI");
     ASSERT(devtoolsApiObject.isObject());
 
-    Page* targetPage = m_frontendPage;
+    Page* targetPage = m_frontendFrame->page();
     if (event->target() && event->target()->executionContext() && event->target()->executionContext()->executingWindow()) {
         LocalDOMWindow* window = event->target()->executionContext()->executingWindow();
         if (window->document() && window->document()->page())
             targetPage = window->document()->page();
     }
 
     RefPtrWillBeRawPtr<FrontendMenuProvider> menuProvider = FrontendMenuProvider::create(this, devtoolsApiObject, items);
     targetPage->contextMenuController().showContextMenu(event, menuProvider);
     m_menuProvider = menuProvider.get();
 }
@@ skipping 12 matching lines @@
 {
     return m_client && m_client->isUnderTest();
 }
 
 bool DevToolsHost::isHostedMode()
 {
     return false;
 }
 
 } // namespace blink