Source/core/loader/TextResourceDecoderBuilder.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/TextResourceDecoderBuilder.cpp

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

Patch Set: dcheng's comment addressed 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/TextResourceDecoderBuilder.cpp

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

index 84f6b5112e648f16491f362eb477eebcb7f1fbb5..d6750fac4ad14d39edcc50a4344a9f120d8d37dc 100644

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

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

@@ -71,7 +71,7 @@ inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod

LocalFrame* frame = document->frame();

LocalFrame* parentFrame = 0;

if (frame && frame->tree().parent() && frame->tree().parent()->isLocalFrame())

- parentFrame = frame->tree().parent();

+ parentFrame = toLocalFrame(frame->tree().parent());

if (!m_encoding.isEmpty())

decoder->setEncoding(m_encoding.string(), m_encodingWasChosenByUser ? TextResourceDecoder::UserChosenEncoding : TextResourceDecoder::EncodingFromHTTPHeader);

« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/core/loader/appcache/ApplicationCacheHost.cpp » ('j') | no next file with comments »