| Index: third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.h
|
| diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.h b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.h
|
| index 9d7727c6148670d0e37a0bc6d99e4a2f06285297..458bf0520c1005c5ab234a0820bcd9d6e57a00ce 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.h
|
| +++ b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.h
|
| @@ -47,16 +47,16 @@ class Element;
|
| class HTMLDocument;
|
| class HTMLDocumentParser;
|
|
|
| -class HTMLTreeBuilder final : public NoBaseWillBeGarbageCollectedFinalized<HTMLTreeBuilder> {
|
| - WTF_MAKE_NONCOPYABLE(HTMLTreeBuilder); USING_FAST_MALLOC_WILL_BE_REMOVED(HTMLTreeBuilder);
|
| +class HTMLTreeBuilder final : public GarbageCollectedFinalized<HTMLTreeBuilder> {
|
| + WTF_MAKE_NONCOPYABLE(HTMLTreeBuilder);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, HTMLDocument* document, ParserContentPolicy parserContentPolicy, bool reportErrors, const HTMLParserOptions& options)
|
| + static RawPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, HTMLDocument* document, ParserContentPolicy parserContentPolicy, bool reportErrors, const HTMLParserOptions& options)
|
| {
|
| - return adoptPtrWillBeNoop(new HTMLTreeBuilder(parser, document, parserContentPolicy, reportErrors, options));
|
| + return new HTMLTreeBuilder(parser, document, parserContentPolicy, reportErrors, options);
|
| }
|
| - static PassOwnPtrWillBeRawPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, DocumentFragment* fragment, Element* contextElement, ParserContentPolicy parserContentPolicy, const HTMLParserOptions& options)
|
| + static RawPtr<HTMLTreeBuilder> create(HTMLDocumentParser* parser, DocumentFragment* fragment, Element* contextElement, ParserContentPolicy parserContentPolicy, const HTMLParserOptions& options)
|
| {
|
| - return adoptPtrWillBeNoop(new HTMLTreeBuilder(parser, fragment, contextElement, parserContentPolicy, options));
|
| + return new HTMLTreeBuilder(parser, fragment, contextElement, parserContentPolicy, options);
|
| }
|
| ~HTMLTreeBuilder();
|
| DECLARE_TRACE();
|
| @@ -73,7 +73,7 @@ public:
|
|
|
| bool hasParserBlockingScript() const { return !!m_scriptToProcess; }
|
| // Must be called to take the parser-blocking script before calling the parser again.
|
| - PassRefPtrWillBeRawPtr<Element> takeScriptToProcess(TextPosition& scriptStartPosition);
|
| + RawPtr<Element> takeScriptToProcess(TextPosition& scriptStartPosition);
|
|
|
| // Done, close any open tags, etc.
|
| void finished();
|
| @@ -203,8 +203,8 @@ private:
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - RawPtrWillBeMember<DocumentFragment> m_fragment;
|
| - RefPtrWillBeMember<HTMLStackItem> m_contextElementStackItem;
|
| + Member<DocumentFragment> m_fragment;
|
| + Member<HTMLStackItem> m_contextElementStackItem;
|
| };
|
|
|
| // https://html.spec.whatwg.org/#frameset-ok-flag
|
| @@ -230,9 +230,9 @@ private:
|
|
|
| // We access parser because HTML5 spec requires that we be able to change the state of the tokenizer
|
| // from within parser actions. We also need it to track the current position.
|
| - RawPtrWillBeMember<HTMLDocumentParser> m_parser;
|
| + Member<HTMLDocumentParser> m_parser;
|
|
|
| - RefPtrWillBeMember<Element> m_scriptToProcess; // <script> tag which needs processing before resuming the parser.
|
| + Member<Element> m_scriptToProcess; // <script> tag which needs processing before resuming the parser.
|
| TextPosition m_scriptToProcessStartPosition; // Starting line number of the script tag needing processing.
|
|
|
| HTMLParserOptions m_options;
|
|
|