[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit f34db7c8bd15d06c12a8758375836af0256e6b91
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 17 23:08:06 2003 +0000

            Reviewed by Dave.
    
    	- fixed the crashing so the layout tests work
    
            * khtml/rendering/render_layer.h: Add a node pointer result.
            * khtml/rendering/render_layer.cpp: (RenderLayer::elementList):
    	Return the node pointer so we can destroy it when done with it.
    
            * khtml/rendering/render_object.h: Make renderArena() const.
            * khtml/rendering/render_object.cpp: (RenderObject::renderArena): Make it const.
    
            * kwq/KWQRenderTreeDebug.cpp: (writeLayers): Free the Z layer list when done.
    	Without this things just crashed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3353 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5d2157d..27198dc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2003-01-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed the crashing so the layout tests work
+
+        * khtml/rendering/render_layer.h: Add a node pointer result.
+        * khtml/rendering/render_layer.cpp: (RenderLayer::elementList):
+	Return the node pointer so we can destroy it when done with it.
+
+        * khtml/rendering/render_object.h: Make renderArena() const.
+        * khtml/rendering/render_object.cpp: (RenderObject::renderArena): Make it const.
+
+        * kwq/KWQRenderTreeDebug.cpp: (writeLayers): Free the Z layer list when done.
+	Without this things just crashed.
+
 2003-01-17  Richard Williamson   <rjw at apple.com>
 
         Fixed 3126141. Allow pages with plugins to be cached.  This is safe
@@ -9,7 +25,6 @@
         * kwq/KWQKHTMLPart.mm:
         (KWQKHTMLPart::canCachePage):
 
-=======
 2003-01-17  David Hyatt  <hyatt at apple.com>
 
 	The new table code from Lars.  Also includes bug fixes for
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5d2157d..27198dc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2003-01-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed the crashing so the layout tests work
+
+        * khtml/rendering/render_layer.h: Add a node pointer result.
+        * khtml/rendering/render_layer.cpp: (RenderLayer::elementList):
+	Return the node pointer so we can destroy it when done with it.
+
+        * khtml/rendering/render_object.h: Make renderArena() const.
+        * khtml/rendering/render_object.cpp: (RenderObject::renderArena): Make it const.
+
+        * kwq/KWQRenderTreeDebug.cpp: (writeLayers): Free the Z layer list when done.
+	Without this things just crashed.
+
 2003-01-17  Richard Williamson   <rjw at apple.com>
 
         Fixed 3126141. Allow pages with plugins to be cached.  This is safe
@@ -9,7 +25,6 @@
         * kwq/KWQKHTMLPart.mm:
         (KWQKHTMLPart::canCachePage):
 
-=======
 2003-01-17  David Hyatt  <hyatt at apple.com>
 
 	The new table code from Lars.  Also includes bug fixes for
diff --git a/WebCore/khtml/rendering/render_layer.cpp b/WebCore/khtml/rendering/render_layer.cpp
index 7ad769e..799e522 100644
--- a/WebCore/khtml/rendering/render_layer.cpp
+++ b/WebCore/khtml/rendering/render_layer.cpp
@@ -674,15 +674,14 @@ void RenderLayer::RenderZTreeNode::detach(RenderArena* renderArena)
     renderArena->free(*(size_t *)this, this);
 }
 
-QPtrVector<RenderLayer::RenderLayerElement> RenderLayer::elementList()
+QPtrVector<RenderLayer::RenderLayerElement> RenderLayer::elementList(RenderZTreeNode *&node)
 {
     QPtrVector<RenderLayerElement> list;
     
     QRect damageRect(m_x, m_y, m_width, m_height);
-    RenderZTreeNode *node = constructZTree(damageRect, damageRect, this);
+    node = constructZTree(damageRect, damageRect, this);
     if (node) {
         constructLayerList(node, &list);
-        node->detach(renderer()->renderArena());
     }
     
     return list;
diff --git a/WebCore/khtml/rendering/render_layer.h b/WebCore/khtml/rendering/render_layer.h
index c8d9fc5..fff06ae 100644
--- a/WebCore/khtml/rendering/render_layer.h
+++ b/WebCore/khtml/rendering/render_layer.h
@@ -233,7 +233,7 @@ public:
     };
     
     // For debugging.
-    QPtrVector<RenderLayerElement> elementList();
+    QPtrVector<RenderLayerElement> elementList(RenderZTreeNode *&node);
       
 private:
     // The constructZTree function creates a z-tree for a given layer hierarchy
diff --git a/WebCore/khtml/rendering/render_object.cpp b/WebCore/khtml/rendering/render_object.cpp
index 86af2f8..ca7d4c1 100644
--- a/WebCore/khtml/rendering/render_object.cpp
+++ b/WebCore/khtml/rendering/render_object.cpp
@@ -957,7 +957,8 @@ void RenderObject::removeFromSpecialObjects()
     }
 }
 
-RenderArena* RenderObject::renderArena() {
+RenderArena* RenderObject::renderArena() const
+{
     DOM::NodeImpl* elt = element();
     RenderObject* current = parent();
     while (!elt && current) {
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index cfe912a..b13eab5 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -156,7 +156,7 @@ private:
     void* operator new(size_t sz) throw();
     
 public:
-    RenderArena* renderArena();
+    RenderArena* renderArena() const;
     
     // some helper functions...
     virtual bool childrenInline() const { return false; }
diff --git a/WebCore/kwq/KWQRenderTreeDebug.cpp b/WebCore/kwq/KWQRenderTreeDebug.cpp
index 39c3db5..2bcc14a 100644
--- a/WebCore/kwq/KWQRenderTreeDebug.cpp
+++ b/WebCore/kwq/KWQRenderTreeDebug.cpp
@@ -41,6 +41,7 @@ using khtml::RenderTableCell;
 using khtml::RenderWidget;
 
 typedef khtml::RenderLayer::RenderLayerElement RenderLayerElement;
+typedef khtml::RenderLayer::RenderZTreeNode RenderZTreeNode;
 
 static void writeLayers(QTextStream &ts, const RenderObject &o, int indent = 0);
 
@@ -132,10 +133,14 @@ static void write(QTextStream &ts, const RenderLayerElement &e, int indent = 0)
 
 static void writeLayers(QTextStream &ts, const RenderObject &o, int indent)
 {
-    QPtrVector<RenderLayerElement> list = o.layer()->elementList();
+    RenderZTreeNode *node;
+    QPtrVector<RenderLayerElement> list = o.layer()->elementList(node);
     for (unsigned i = 0; i != list.count(); ++i) {
         write(ts, *list[i], indent);
     }
+    if (node) {
+        node->detach(o.renderArena());
+    }
 }
 
 QString externalRepresentation(const RenderObject *o)

-- 
WebKit Debian packaging