Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Unified Diff: Source/core/inspector/DevToolsHost.cpp

Issue 900543003: DevTools: do not abuse inspector controller for the front-end side plumbing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed initializer. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/DevToolsHost.h ('k') | Source/core/inspector/InspectorClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/DevToolsHost.cpp
diff --git a/Source/core/inspector/DevToolsHost.cpp b/Source/core/inspector/DevToolsHost.cpp
index bfa65227442649175033da1055830cafb954fcb2..83c2ed40e8fb4ed446099a3e8e130fe08ea6074b 100644
--- a/Source/core/inspector/DevToolsHost.cpp
+++ b/Source/core/inspector/DevToolsHost.cpp
@@ -40,7 +40,6 @@
#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"
@@ -127,9 +126,9 @@ private:
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)
{
}
@@ -141,7 +140,7 @@ DevToolsHost::~DevToolsHost()
void DevToolsHost::trace(Visitor* visitor)
{
- visitor->trace(m_frontendPage);
+ visitor->trace(m_frontendFrame);
visitor->trace(m_menuProvider);
}
@@ -152,23 +151,18 @@ void DevToolsHost::disconnectClient()
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)
@@ -213,17 +207,18 @@ void DevToolsHost::sendMessageToEmbedder(const String& message)
m_client->sendMessageToEmbedder(escapeUnicodeNonCharacters(message));
}
-void DevToolsHost::showContextMenu(Page* page, float x, float y, const Vector<ContextMenuItem>& items)
+void DevToolsHost::showContextMenu(LocalFrame* targetFrame, 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);
+ float zoom = targetFrame->pageZoomFactor();
+ if (m_client)
+ m_client->showContextMenu(targetFrame, x * zoom, y * zoom, menuProvider);
}
void DevToolsHost::showContextMenu(Event* event, const Vector<ContextMenuItem>& items)
@@ -231,12 +226,12 @@ void DevToolsHost::showContextMenu(Event* event, const Vector<ContextMenuItem>&
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())
« no previous file with comments | « Source/core/inspector/DevToolsHost.h ('k') | Source/core/inspector/InspectorClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698