Changeset 51678 in webkit

Timestamp:

Dec 3, 2009 9:54:58 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

OwnPtr<RenderArena> Document::m_renderArena;
​https://bugs.webkit.org/show_bug.cgi?id=32146

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

• dom/Document.cpp: (WebCore::Document::Document): Also, removed a redundant initialization of the tokenizer that I missed in my previous patch. (WebCore::Document::~Document): (WebCore::Document::attach): (WebCore::Document::detach):
• dom/Document.h: (WebCore::Document::renderArena):

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<RenderArena> Document::m_renderArena;
+        https://bugs.webkit.org/show_bug.cgi?id=32146
+
+        The document owns the renderArena.  That's what the code should say.
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document): Also, removed a redundant initialization
+        of the tokenizer that I missed in my previous patch.
+        (WebCore::Document::~Document):
+        (WebCore::Document::attach):
+        (WebCore::Document::detach):
+        * dom/Document.h:
+        (WebCore::Document::renderArena):
+
 2009-12-03  Drew Wilson  <atwilson@chromium.org>
 

trunk/WebCore/dom/Document.cpp

@@ -369 +369 @@
 
     m_frame = frame;
-    m_renderArena = 0;
 
     m_axObjectCache = 0;
@@ -377 +376 @@
     visuallyOrdered = false;
     m_bParsing = false;
-    m_tokenizer = 0;
     m_wellFormed = false;
 
@@ -488 +486 @@
     m_docLoader.clear();
 
-    if (m_renderArena) {
-        delete m_renderArena;
-        m_renderArena = 0;
-    }
+    m_renderArena.clear();
 
 #if ENABLE(XBL)
@@ -1407 +1402 @@
     
     // Create the rendering tree
-    setRenderer(new (m_renderArena) RenderView(this, view()));
+    setRenderer(new (m_renderArena.get()) RenderView(this, view()));
 #if USE(ACCELERATED_COMPOSITING)
     renderView()->didMoveOnscreen();
@@ -1484 +1479 @@
     // callers of Document::detach().
     m_frame = 0;
-    
-    if (m_renderArena) {
-        delete m_renderArena;
-        m_renderArena = 0;
-    }
+    m_renderArena.clear();
 }
 

trunk/WebCore/dom/Document.h

@@ -459 +459 @@
     virtual void detach();
 
-    RenderArena* renderArena() { return m_renderArena; }
+    RenderArena* renderArena() { return m_renderArena.get(); }
 
     RenderView* renderView() const;
@@ -1061 +1061 @@
     bool m_titleSetExplicitly;
     RefPtr<Element> m_titleElement;
-    
-    RenderArena* m_renderArena;
+
+    OwnPtr<RenderArena> m_renderArena;
 
     typedef std::pair<Vector<DocumentMarker>, Vector<IntRect> > MarkerMapVectorPair;