third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp - Issue 2293373002: Remove unused prefs/api/resource for setPageEncoding

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

Issue 2293373002: Remove unused prefs/api/resource for setPageEncoding (Closed)

Patch Set: removed unused flag/prefs Created 4 years, 3 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

« third_party/WebKit/Source/core/html/parser/TextResourceDecoder.cpp ('K') | « third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp ('k') | third_party/WebKit/Source/web/WebSettingsImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp

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

index 86189fbc0778d9723e61b55c0087f4d699f73e3f..bd0a0113396b685961780b39e4fa091d37636680 100644

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

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

@@ -134,7 +134,7 @@ inline std::unique_ptr<TextResourceDecoder> TextResourceDecoderBuilder::createDe

const WTF::TextEncoding encodingFromDomain = getEncodingFromDomain(document->url());

if (LocalFrame* frame = document->frame()) {

if (Settings* settings = frame->settings())

- return TextResourceDecoder::create(m_mimeType, encodingFromDomain.isValid() ? encodingFromDomain : settings->defaultTextEncodingName(), settings->usesEncodingDetector());

+ return TextResourceDecoder::create(m_mimeType, encodingFromDomain.isValid() ? encodingFromDomain : settings->defaultTextEncodingName(), true);

}

return TextResourceDecoder::create(m_mimeType, encodingFromDomain);