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

Unified Diff: Source/web/InspectorFrontendClientImpl.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased 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
« no previous file with comments | « Source/modules/geolocation/GeolocationController.cpp ('k') | Source/web/PageWidgetDelegate.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/InspectorFrontendClientImpl.cpp
diff --git a/Source/web/InspectorFrontendClientImpl.cpp b/Source/web/InspectorFrontendClientImpl.cpp
index 6203bb51ef105e9f86a2571ed8ee62537b91c17e..2493ff21a92fed83f1b479e82240cc47287edcac 100644
--- a/Source/web/InspectorFrontendClientImpl.cpp
+++ b/Source/web/InspectorFrontendClientImpl.cpp
@@ -63,7 +63,7 @@ void InspectorFrontendClientImpl::windowObjectCleared()
{
v8::Isolate* isolate = v8::Isolate::GetCurrent();
ASSERT(m_frontendPage->mainFrame());
- ScriptState* scriptState = ScriptState::forMainWorld(m_frontendPage->mainFrame());
+ ScriptState* scriptState = ScriptState::forMainWorld(m_frontendPage->deprecatedLocalMainFrame());
ScriptState::Scope scope(scriptState);
if (m_frontendHost)
@@ -73,7 +73,7 @@ void InspectorFrontendClientImpl::windowObjectCleared()
v8::Handle<v8::Value> frontendHostObj = toV8(m_frontendHost.get(), global, scriptState->isolate());
global->Set(v8::String::NewFromUtf8(isolate, "InspectorFrontendHost"), frontendHostObj);
- ScriptController* scriptController = m_frontendPage->mainFrame() ? &m_frontendPage->mainFrame()->script() : 0;
+ ScriptController* scriptController = m_frontendPage->mainFrame() ? &m_frontendPage->deprecatedLocalMainFrame()->script() : 0;
if (scriptController) {
String installAdditionalAPI =
"" // Wrap messages that go to embedder.
« no previous file with comments | « Source/modules/geolocation/GeolocationController.cpp ('k') | Source/web/PageWidgetDelegate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698