| Index: Source/core/html/parser/BackgroundHTMLParser.cpp
|
| diff --git a/Source/core/html/parser/BackgroundHTMLParser.cpp b/Source/core/html/parser/BackgroundHTMLParser.cpp
|
| index 77d11543259836602909d8da77ebeed03c3d073e..b91dafd40b937a88e3e8a56efe946d0f861fe5fa 100644
|
| --- a/Source/core/html/parser/BackgroundHTMLParser.cpp
|
| +++ b/Source/core/html/parser/BackgroundHTMLParser.cpp
|
| @@ -28,7 +28,6 @@
|
|
|
| #include "core/html/parser/HTMLDocumentParser.h"
|
| #include "core/html/parser/HTMLParserThread.h"
|
| -#include "core/html/parser/TextResourceDecoder.h"
|
| #include "core/html/parser/XSSAuditor.h"
|
| #include "wtf/MainThread.h"
|
| #include "wtf/text/TextPosition.h"
|
| @@ -77,12 +76,6 @@ static void checkThatXSSInfosAreSafeToSendToAnotherThread(const XSSInfoStream& i
|
|
|
| #endif
|
|
|
| -void BackgroundHTMLParser::start(PassRefPtr<WeakReference<BackgroundHTMLParser> > reference, PassOwnPtr<Configuration> config)
|
| -{
|
| - new BackgroundHTMLParser(reference, config);
|
| - // Caller must free by calling stop().
|
| -}
|
| -
|
| BackgroundHTMLParser::BackgroundHTMLParser(PassRefPtr<WeakReference<BackgroundHTMLParser> > reference, PassOwnPtr<Configuration> config)
|
| : m_weakFactory(reference, this)
|
| , m_token(adoptPtr(new HTMLToken))
|
| @@ -93,11 +86,6 @@ BackgroundHTMLParser::BackgroundHTMLParser(PassRefPtr<WeakReference<BackgroundHT
|
| , m_pendingTokens(adoptPtr(new CompactHTMLTokenStream))
|
| , m_xssAuditor(config->xssAuditor.release())
|
| , m_preloadScanner(config->preloadScanner.release())
|
| - , m_decoder(config->decoder.release())
|
| -{
|
| -}
|
| -
|
| -BackgroundHTMLParser::~BackgroundHTMLParser()
|
| {
|
| }
|
|
|
| @@ -108,38 +96,6 @@ void BackgroundHTMLParser::append(const String& input)
|
| pumpTokenizer();
|
| }
|
|
|
| -void BackgroundHTMLParser::appendBytes(PassOwnPtr<Vector<char> > buffer)
|
| -{
|
| - updateDocument(m_decoder->decode(buffer->data(), buffer->size()));
|
| -}
|
| -
|
| -void BackgroundHTMLParser::setDecoder(PassOwnPtr<TextResourceDecoder> decoder)
|
| -{
|
| - m_decoder = decoder;
|
| -}
|
| -
|
| -void BackgroundHTMLParser::flush()
|
| -{
|
| - updateDocument(m_decoder->flush());
|
| -}
|
| -
|
| -void BackgroundHTMLParser::updateDocument(const String& decodedData)
|
| -{
|
| - DocumentEncodingData encodingData(*m_decoder.get());
|
| -
|
| - if (encodingData != m_lastSeenEncodingData) {
|
| - m_lastSeenEncodingData = encodingData;
|
| -
|
| - m_xssAuditor->setEncoding(encodingData.encoding());
|
| - callOnMainThread(bind(&HTMLDocumentParser::didReceiveEncodingDataFromBackgroundParser, m_parser, encodingData));
|
| - }
|
| -
|
| - if (decodedData.isEmpty())
|
| - return;
|
| -
|
| - append(decodedData);
|
| -}
|
| -
|
| void BackgroundHTMLParser::resumeFrom(PassOwnPtr<Checkpoint> checkpoint)
|
| {
|
| m_parser = checkpoint->parser;
|
|
|