| Index: third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.h
|
| diff --git a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.h b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.h
|
| index 2748dfc24fd2c0eedc9cefe9ef7288687cde413e..69714f26cfca946fedf40c43afa14bd6bdb0b9b4 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.h
|
| +++ b/third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.h
|
| @@ -67,12 +67,11 @@ class ParsedChunkQueue;
|
| class PumpSession;
|
|
|
| class HTMLDocumentParser : public ScriptableDocumentParser, private HTMLScriptRunnerHost {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(HTMLDocumentParser);
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLDocumentParser);
|
| + USING_GARBAGE_COLLECTED_MIXIN(HTMLDocumentParser);
|
| public:
|
| - static PassRefPtrWillBeRawPtr<HTMLDocumentParser> create(HTMLDocument& document, bool reportErrors, ParserSynchronizationPolicy backgroundParsingPolicy)
|
| + static RawPtr<HTMLDocumentParser> create(HTMLDocument& document, bool reportErrors, ParserSynchronizationPolicy backgroundParsingPolicy)
|
| {
|
| - return adoptRefWillBeNoop(new HTMLDocumentParser(document, reportErrors, backgroundParsingPolicy));
|
| + return new HTMLDocumentParser(document, reportErrors, backgroundParsingPolicy);
|
| }
|
| ~HTMLDocumentParser() override;
|
| DECLARE_VIRTUAL_TRACE();
|
| @@ -124,9 +123,9 @@ protected:
|
| void forcePlaintextForTextDocument();
|
|
|
| private:
|
| - static PassRefPtrWillBeRawPtr<HTMLDocumentParser> create(DocumentFragment* fragment, Element* contextElement, ParserContentPolicy parserContentPolicy)
|
| + static RawPtr<HTMLDocumentParser> create(DocumentFragment* fragment, Element* contextElement, ParserContentPolicy parserContentPolicy)
|
| {
|
| - return adoptRefWillBeNoop(new HTMLDocumentParser(fragment, contextElement, parserContentPolicy));
|
| + return new HTMLDocumentParser(fragment, contextElement, parserContentPolicy);
|
| }
|
|
|
| // DocumentParser
|
| @@ -179,12 +178,12 @@ private:
|
|
|
| OwnPtr<HTMLToken> m_token;
|
| OwnPtr<HTMLTokenizer> m_tokenizer;
|
| - OwnPtrWillBeMember<HTMLScriptRunner> m_scriptRunner;
|
| - OwnPtrWillBeMember<HTMLTreeBuilder> m_treeBuilder;
|
| + Member<HTMLScriptRunner> m_scriptRunner;
|
| + Member<HTMLTreeBuilder> m_treeBuilder;
|
| OwnPtr<HTMLPreloadScanner> m_preloadScanner;
|
| OwnPtr<HTMLPreloadScanner> m_insertionPreloadScanner;
|
| OwnPtr<WebTaskRunner> m_loadingTaskRunner;
|
| - OwnPtrWillBeMember<HTMLParserScheduler> m_parserScheduler;
|
| + Member<HTMLParserScheduler> m_parserScheduler;
|
| HTMLSourceTracker m_sourceTracker;
|
| TextPosition m_textPosition;
|
| XSSAuditor m_xssAuditor;
|
| @@ -196,7 +195,7 @@ private:
|
| Deque<OwnPtr<ParsedChunk>> m_speculations;
|
| WeakPtrFactory<HTMLDocumentParser> m_weakFactory;
|
| WeakPtr<BackgroundHTMLParser> m_backgroundParser;
|
| - OwnPtrWillBeMember<HTMLResourcePreloader> m_preloader;
|
| + Member<HTMLResourcePreloader> m_preloader;
|
| PreloadRequestStream m_queuedPreloads;
|
| RefPtr<ParsedChunkQueue> m_parsedChunkQueue;
|
|
|
|
|