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

Unified Diff: Source/core/inspector/InspectorDOMAgent.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/core/frame/PinchViewport.cpp ('k') | Source/core/inspector/InspectorFrontendHost.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorDOMAgent.cpp
diff --git a/Source/core/inspector/InspectorDOMAgent.cpp b/Source/core/inspector/InspectorDOMAgent.cpp
index 10d432c7c3f350d9ff0e6cc8c16cf66657fc3a7b..8cf962e87e9c346f6df13bdf2c6cafd77a6838ef 100644
--- a/Source/core/inspector/InspectorDOMAgent.cpp
+++ b/Source/core/inspector/InspectorDOMAgent.cpp
@@ -1777,7 +1777,9 @@ void InspectorDOMAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader)
// FIXME: If "frame" is always guarenteed to be in the same Page as loader->frame()
// then all we need to check here is loader->frame()->isMainFrame()
// and we don't need "frame" at all.
- LocalFrame* mainFrame = frame->page()->mainFrame();
+ if (!frame->page()->mainFrame()->isLocalFrame())
+ return;
+ LocalFrame* mainFrame = frame->page()->deprecatedLocalMainFrame();
if (loader->frame() != mainFrame) {
invalidateFrameOwnerElement(loader->frame());
return;
« no previous file with comments | « Source/core/frame/PinchViewport.cpp ('k') | Source/core/inspector/InspectorFrontendHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698