Source/core/loader/FrameLoader.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/loader/FrameLoader.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:

Index: Source/core/loader/FrameLoader.cpp

diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp

index 769c8a81a9010a994cbfa562583eb0dc23ed9d49..3289609ec2743a3e464e4aaaa443079e5c06cc5e 100644

--- a/Source/core/loader/FrameLoader.cpp

+++ b/Source/core/loader/FrameLoader.cpp

@@ -1077,8 +1077,10 @@ void FrameLoader::detachChildren()

void FrameLoader::checkLoadComplete()

{

ASSERT(client()->hasWebView());

- if (Page* page = m_frame->page())

- page->mainFrame()->loader().checkLoadCompleteForThisFrame();

+ if (Page* page = m_frame->page()) {

+ if (page->mainFrame()->isLocalFrame())

+ page->deprecatedLocalMainFrame()->loader().checkLoadCompleteForThisFrame();

+ }

}

String FrameLoader::userAgent(const KURL& url) const