Chromium Code Reviews| Index: Source/core/dom/DecodedDataDocumentParser.cpp |
| diff --git a/Source/core/dom/DecodedDataDocumentParser.cpp b/Source/core/dom/DecodedDataDocumentParser.cpp |
| index 02b299fc97c448158191b7893749ad6d4ec3fc6e..1a63f028299218caa7ec1363f0ce1e17b043980e 100644 |
| --- a/Source/core/dom/DecodedDataDocumentParser.cpp |
| +++ b/Source/core/dom/DecodedDataDocumentParser.cpp |
| @@ -35,6 +35,7 @@ namespace WebCore { |
| DecodedDataDocumentParser::DecodedDataDocumentParser(Document* document) |
| : DocumentParser(document) |
| , m_hasAppendedData(false) |
| + , m_needsDecoder(true) |
| { |
| } |
| @@ -44,6 +45,7 @@ DecodedDataDocumentParser::~DecodedDataDocumentParser() |
| void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decoder) |
| { |
| + m_needsDecoder = false; |
| m_decoder = decoder; |
| } |
| @@ -52,6 +54,11 @@ TextResourceDecoder* DecodedDataDocumentParser::decoder() |
| return m_decoder.get(); |
| } |
| +PassOwnPtr<TextResourceDecoder> DecodedDataDocumentParser::takeDecoder() |
| +{ |
| + return m_decoder.release(); |
| +} |
| + |
| void DecodedDataDocumentParser::setHasAppendedData() |
| { |
| m_hasAppendedData = true; |
| @@ -92,9 +99,7 @@ void DecodedDataDocumentParser::flush() |
| void DecodedDataDocumentParser::updateDocument(String& decodedData) |
| { |
| DocumentEncodingData encodingData; |
| - encodingData.encoding = m_decoder->encoding(); |
| - encodingData.wasDetectedHeuristically = m_decoder->encodingWasDetectedHeuristically(); |
| - encodingData.sawDecodingError = m_decoder->sawError(); |
| + m_decoder->getEncodingData(encodingData); |
|
eseidel
2013/11/18 22:32:07
document()->setEncodingData(m_decoder->encodingDat
|
| document()->setEncodingData(encodingData); |
| if (decodedData.isEmpty()) |