[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit da0aa030cf52cb36b7860081ffa7383b4614b7c5
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 05:54:58 2009 +0000

    2009-12-03  Adam Barth  <abarth at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cf11fc8..a963177 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-03  Adam Barth  <abarth at 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 at chromium.org>
 
         Rolling back r51633 because it causes a chromium perf regression.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 8d2990e..e4b2713 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -368,7 +368,6 @@ Document::Document(Frame* frame, bool isXHTML)
     m_ignoreAutofocus = false;
 
     m_frame = frame;
-    m_renderArena = 0;
 
     m_axObjectCache = 0;
     
@@ -376,7 +375,6 @@ Document::Document(Frame* frame, bool isXHTML)
 
     visuallyOrdered = false;
     m_bParsing = false;
-    m_tokenizer = 0;
     m_wellFormed = false;
 
     setParseMode(Strict);
@@ -487,10 +485,7 @@ Document::~Document()
     delete m_styleSelector;
     m_docLoader.clear();
 
-    if (m_renderArena) {
-        delete m_renderArena;
-        m_renderArena = 0;
-    }
+    m_renderArena.clear();
 
 #if ENABLE(XBL)
     delete m_bindingManager;
@@ -1406,7 +1401,7 @@ void Document::attach()
         m_renderArena = new RenderArena();
     
     // 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();
 #endif
@@ -1483,11 +1478,7 @@ void Document::detach()
     // or this setting of the frame to 0 could be made explicit in each of the
     // callers of Document::detach().
     m_frame = 0;
-    
-    if (m_renderArena) {
-        delete m_renderArena;
-        m_renderArena = 0;
-    }
+    m_renderArena.clear();
 }
 
 void Document::removeAllEventListeners()
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 34c735b..3fc6165 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -458,7 +458,7 @@ public:
     virtual void attach();
     virtual void detach();
 
-    RenderArena* renderArena() { return m_renderArena; }
+    RenderArena* renderArena() { return m_renderArena.get(); }
 
     RenderView* renderView() const;
 
@@ -1060,8 +1060,8 @@ private:
     String m_title;
     bool m_titleSetExplicitly;
     RefPtr<Element> m_titleElement;
-    
-    RenderArena* m_renderArena;
+
+    OwnPtr<RenderArena> m_renderArena;
 
     typedef std::pair<Vector<DocumentMarker>, Vector<IntRect> > MarkerMapVectorPair;
     typedef HashMap<RefPtr<Node>, MarkerMapVectorPair*> MarkerMap;

-- 
WebKit Debian packaging