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

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

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Android/Mac fixes Created 6 years, 6 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
Index: Source/core/inspector/InspectorFrontendHost.cpp
diff --git a/Source/core/inspector/InspectorFrontendHost.cpp b/Source/core/inspector/InspectorFrontendHost.cpp
index f138740679f48c9d1abaa971bc8d2ab3788c9f3b..133b7e85f38298f08a540a09a282eed3964ca243 100644
--- a/Source/core/inspector/InspectorFrontendHost.cpp
+++ b/Source/core/inspector/InspectorFrontendHost.cpp
@@ -136,12 +136,12 @@ void InspectorFrontendHost::disconnectClient()
void InspectorFrontendHost::setZoomFactor(float zoom)
{
- m_frontendPage->mainFrame()->setPageAndTextZoomFactors(zoom, 1);
+ toLocalFrame(m_frontendPage->mainFrame())->setPageAndTextZoomFactors(zoom, 1);
}
float InspectorFrontendHost::zoomFactor()
{
- return m_frontendPage->mainFrame()->pageZoomFactor();
+ return toLocalFrame(m_frontendPage->mainFrame())->pageZoomFactor();
}
void InspectorFrontendHost::setInjectedScriptForOrigin(const String& origin, const String& script)
@@ -189,7 +189,7 @@ void InspectorFrontendHost::showContextMenu(Event* event, const Vector<ContextMe
return;
ASSERT(m_frontendPage);
- ScriptState* frontendScriptState = ScriptState::forMainWorld(m_frontendPage->mainFrame());
+ ScriptState* frontendScriptState = ScriptState::forMainWorld(toLocalFrame(m_frontendPage->mainFrame()));
ScriptValue frontendApiObject = frontendScriptState->getFromGlobalObject("InspectorFrontendAPI");
ASSERT(frontendApiObject.isObject());
RefPtr<FrontendMenuProvider> menuProvider = FrontendMenuProvider::create(this, frontendApiObject, items);

Powered by Google App Engine
This is Rietveld 408576698