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

Unified Diff: Source/core/page/CreateWindow.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/loader/PingLoader.cpp ('k') | Source/core/page/DragController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/CreateWindow.cpp
diff --git a/Source/core/page/CreateWindow.cpp b/Source/core/page/CreateWindow.cpp
index ab39dfa0a92d54b29fb2ce48ea61c0a75038cf15..7289d186c36f91956af366e79087dc7b9b138d54 100644
--- a/Source/core/page/CreateWindow.cpp
+++ b/Source/core/page/CreateWindow.cpp
@@ -76,12 +76,12 @@ static LocalFrame* createWindow(LocalFrame& openerFrame, LocalFrame& lookupFrame
return 0;
Page* page = oldPage->chrome().client().createWindow(&openerFrame, request, features, policy, shouldSendReferrer);
- if (!page)
+ if (!page || !page->mainFrame()->isLocalFrame())
return 0;
FrameHost* host = &page->frameHost();
ASSERT(page->mainFrame());
- LocalFrame& frame = *page->mainFrame();
+ LocalFrame& frame = *page->deprecatedLocalMainFrame();
if (request.frameName() != "_blank")
frame.tree().setName(request.frameName());
« no previous file with comments | « Source/core/loader/PingLoader.cpp ('k') | Source/core/page/DragController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698