Changeset 51679 in webkit

Timestamp:

Dec 3, 2009 9:55:46 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-12-03 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

OwnPtr<Tokenizer> Document::m_tokenizer;
​https://bugs.webkit.org/show_bug.cgi?id=32145

The document actually owns the tokenizer. That's what the code should say.

• dom/Document.cpp: (WebCore::Document::removedLastRef): (WebCore::Document::~Document): (WebCore::Document::cancelParsing): (WebCore::Document::implicitOpen): (WebCore::Document::implicitClose):
• dom/Document.h: (WebCore::Document::tokenizer):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (5 diffs)
• dom/Document.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-03  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        OwnPtr<Tokenizer> Document::m_tokenizer;
+        https://bugs.webkit.org/show_bug.cgi?id=32145
+
+        The document actually owns the tokenizer.  That's what the code should say.
+
+        * dom/Document.cpp:
+        (WebCore::Document::removedLastRef):
+        (WebCore::Document::~Document):
+        (WebCore::Document::cancelParsing):
+        (WebCore::Document::implicitOpen):
+        (WebCore::Document::implicitClose):
+        * dom/Document.h:
+        (WebCore::Document::tokenizer):
+
 2009-12-03  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/dom/Document.cpp

@@ -446 +446 @@
         m_markers.clear();
 
-        delete m_tokenizer;
-        m_tokenizer = 0;
+        m_tokenizer.clear();
 
         m_cssCanvasElements.clear();
@@ -481 +480 @@
 #endif
 
-    delete m_tokenizer;
+    m_tokenizer.clear();
     m_document = 0;
     delete m_styleSelector;
@@ -1594 +1593 @@
         // change, such as opening a new document or closing the window while
         // still parsing
-        delete m_tokenizer;
-        m_tokenizer = 0;
+        m_tokenizer.clear();
         close();
     }
@@ -1604 +1602 @@
     cancelParsing();
 
-    delete m_tokenizer;
-    m_tokenizer = 0;
+    m_tokenizer.clear();
 
     removeChildren();
@@ -1702 +1699 @@
     // We have to clear the tokenizer, in case someone document.write()s from the
     // onLoad event handler, as in Radar 3206524.
-    delete m_tokenizer;
-    m_tokenizer = 0;
+    m_tokenizer.clear();
 
     // Parser should have picked up all preloads by now

trunk/WebCore/dom/Document.h

@@ -507 +507 @@
     
     virtual Tokenizer* createTokenizer();
-    Tokenizer* tokenizer() { return m_tokenizer; }
+    Tokenizer* tokenizer() { return m_tokenizer.get(); }
     
     bool printing() const { return m_printing; }
@@ -962 +962 @@
     Frame* m_frame;
     OwnPtr<DocLoader> m_docLoader;
-    Tokenizer* m_tokenizer;
+    OwnPtr<Tokenizer> m_tokenizer;
     bool m_wellFormed;