Source/core/page/CreateWindow.cpp - Issue 336553003: Change Page::m_mainFrame to be a Frame.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: deprecatedLocalMainFrame 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:

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());