| 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 8fecf2ef8b6cc8f8c915902502006bbd3510a959..9b1e3d4055964e33e4117feccec3b665e7ec3e8e 100644
|
| --- a/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp
|
| @@ -147,7 +147,7 @@ inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod
|
| parentFrame = toLocalFrame(frame->tree().parent());
|
|
|
| if (!m_encoding.isEmpty())
|
| - decoder->setEncoding(m_encoding.string(), TextResourceDecoder::EncodingFromHTTPHeader);
|
| + decoder->setEncoding(m_encoding.getString(), TextResourceDecoder::EncodingFromHTTPHeader);
|
|
|
| // Set the hint encoding to the parent frame encoding only if
|
| // the parent and the current frames share the security origin.
|
|
|