| Index: Source/core/loader/TextResourceDecoderBuilder.cpp
|
| diff --git a/Source/core/loader/TextResourceDecoderBuilder.cpp b/Source/core/loader/TextResourceDecoderBuilder.cpp
|
| index ecb9ae57e5cabb1d9df8a33047d4eb48bde97f1e..1ad37828d0333ef89d92221ce49f4e8045d9045a 100644
|
| --- a/Source/core/loader/TextResourceDecoderBuilder.cpp
|
| +++ b/Source/core/loader/TextResourceDecoderBuilder.cpp
|
| @@ -44,8 +44,10 @@ static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame
|
| }
|
|
|
|
|
| -TextResourceDecoderBuilder::TextResourceDecoderBuilder()
|
| - : m_encodingWasChosenByUser(false)
|
| +TextResourceDecoderBuilder::TextResourceDecoderBuilder(const String& mimeType, const String& encoding, bool encodingUserChoosen)
|
| + : m_mimeType(mimeType)
|
| + , m_encoding(encoding)
|
| + , m_encodingWasChosenByUser(encodingUserChoosen)
|
| {
|
| }
|
|
|
| @@ -96,12 +98,6 @@ PassRefPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* d
|
| return decoder.release();
|
| }
|
|
|
| -void TextResourceDecoderBuilder::setEncoding(const String& encoding, bool userChosen)
|
| -{
|
| - m_encoding = encoding;
|
| - m_encodingWasChosenByUser = userChosen;
|
| -}
|
| -
|
| void TextResourceDecoderBuilder::clear()
|
| {
|
| if (!m_encodingWasChosenByUser)
|
|
|