Source/core/loader/DocumentLoader.cpp - Issue 317493002: Change FrameTree to return Frames instead of LocalFrames.

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/DocumentLoader.cpp

Issue 317493002: Change FrameTree to return Frames instead of LocalFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed conflicts 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

Index: Source/core/loader/DocumentLoader.cpp

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

index 1f585427fdbef4e693d3eb84e673322223bbf40c..62789f914edca76884dc828df1ffefe29c8f606e 100644

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

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

@@ -631,7 +631,7 @@ void DocumentLoader::prepareSubframeArchiveLoadIfNeeded()

if (!m_frame->tree().parent() || !m_frame->tree().parent()->isLocalFrame())

return;

- ArchiveResourceCollection* parentCollection = m_frame->tree().parent()->loader().documentLoader()->m_archiveResourceCollection.get();

+ ArchiveResourceCollection* parentCollection = toLocalFrame(m_frame->tree().parent())->loader().documentLoader()->m_archiveResourceCollection.get();

if (!parentCollection)

return;

« no previous file with comments | « Source/core/frame/LocalFrame.cpp ('k') | Source/core/loader/FrameFetchContext.cpp » ('j') | Source/core/page/FrameTree.cpp » ('J')