Changeset 65863 in webkit

Timestamp:

Aug 23, 2010 9:01:42 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-08-23 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

HTMLTreeBuilder should use adoptPtr
​https://bugs.webkit.org/show_bug.cgi?id=44473

We should really use this pattern everywhere.

• html/HTMLDocumentParser.cpp: (WebCore::HTMLDocumentParser::HTMLDocumentParser):
• html/HTMLTreeBuilder.h: (WebCore::HTMLTreeBuilder::create):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLDocumentParser.cpp (modified) (2 diffs)
• html/HTMLTreeBuilder.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        HTMLTreeBuilder should use adoptPtr
+        https://bugs.webkit.org/show_bug.cgi?id=44473
+
+        We should really use this pattern everywhere.
+
+        * html/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::HTMLDocumentParser):
+        * html/HTMLTreeBuilder.h:
+        (WebCore::HTMLTreeBuilder::create):
+
 2010-08-23  Patrick Gansterer  <paroga@paroga.com>
 

trunk/WebCore/html/HTMLDocumentParser.cpp

@@ -98 +98 @@
     , m_tokenizer(new HTMLTokenizer)
     , m_scriptRunner(new HTMLScriptRunner(document, this))
-    , m_treeBuilder(new HTMLTreeBuilder(m_tokenizer.get(), document, reportErrors))
+    , m_treeBuilder(HTMLTreeBuilder::create(m_tokenizer.get(), document, reportErrors))
     , m_parserScheduler(new HTMLParserScheduler(this))
     , m_endWasDelayed(false)
@@ -110 +110 @@
     : ScriptableDocumentParser(fragment->document())
     , m_tokenizer(new HTMLTokenizer)
-    , m_treeBuilder(new HTMLTreeBuilder(m_tokenizer.get(), fragment, contextElement, scriptingPermission))
+    , m_treeBuilder(HTMLTreeBuilder::create(m_tokenizer.get(), fragment, contextElement, scriptingPermission))
     , m_endWasDelayed(false)
     , m_writeNestingLevel(0)

trunk/WebCore/html/HTMLTreeBuilder.h

@@ -53 +53 @@
 class HTMLTreeBuilder : public Noncopyable {
 public:
-    // FIXME: Replace constructors with create() functions returning PassOwnPtrs
-    HTMLTreeBuilder(HTMLTokenizer*, HTMLDocument*, bool reportErrors);
-    HTMLTreeBuilder(HTMLTokenizer*, DocumentFragment*, Element* contextElement, FragmentScriptingPermission);
+    static PassOwnPtr<HTMLTreeBuilder> create(HTMLTokenizer* tokenizer, HTMLDocument* document, bool reportErrors)
+    {
+        return adoptPtr(new HTMLTreeBuilder(tokenizer, document, reportErrors));
+    }
+    static PassOwnPtr<HTMLTreeBuilder> create(HTMLTokenizer* tokenizer, DocumentFragment* fragment, Element* contextElement, FragmentScriptingPermission scriptingPermission)
+    {
+        return adoptPtr(new HTMLTreeBuilder(tokenizer, fragment, contextElement, scriptingPermission));
+    }
     ~HTMLTreeBuilder();
 
@@ -111 +116 @@
     };
 
+    HTMLTreeBuilder(HTMLTokenizer*, HTMLDocument*, bool reportErrors);
+    HTMLTreeBuilder(HTMLTokenizer*, DocumentFragment*, Element* contextElement, FragmentScriptingPermission);
+
     bool isParsingFragment() const { return !!m_fragmentContext.fragment(); }