Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1208)

Unified Diff: Source/core/loader/TextResourceDecoderBuilder.cpp

Issue 761113003: Make Document.inputEncoding an explicit alias of Document.characterSet (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: drop FIXME Created 6 years 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
« no previous file with comments | « Source/core/loader/FormSubmission.cpp ('k') | Source/core/xmlhttprequest/XMLHttpRequest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/TextResourceDecoderBuilder.cpp
diff --git a/Source/core/loader/TextResourceDecoderBuilder.cpp b/Source/core/loader/TextResourceDecoderBuilder.cpp
index 624873edc914c96f5427ef58825c8902a8dd5d1c..8ce03ae95bca43d0f613c65c71d01d5295503301 100644
--- a/Source/core/loader/TextResourceDecoderBuilder.cpp
+++ b/Source/core/loader/TextResourceDecoderBuilder.cpp
@@ -89,7 +89,7 @@ inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod
decoder->setHintEncoding(parentFrame->document()->encoding());
if (m_encoding.isEmpty())
- decoder->setEncoding(parentFrame->document()->inputEncoding().string(), TextResourceDecoder::EncodingFromParentFrame);
+ decoder->setEncoding(parentFrame->document()->encoding(), TextResourceDecoder::EncodingFromParentFrame);
}
}
« no previous file with comments | « Source/core/loader/FormSubmission.cpp ('k') | Source/core/xmlhttprequest/XMLHttpRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698