[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 53a8ad15a936f4a4e0e8c7d231a7e7c7993022ac
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 14 06:16:39 2002 +0000

    	- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
    
            * khtml/rendering/render_text.h: Add an optional arena parameter to deleteSlaves.
            * khtml/rendering/render_text.cpp:
            (RenderText::detach): Pass the render arena in to deleteSlaves.
            (RenderText::deleteSlaves): Use the passed-in arena.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2667 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 69e6210..d75865f 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-11-13  Darin Adler  <darin at apple.com>
 
+	- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
+
+        * khtml/rendering/render_text.h: Add an optional arena parameter to deleteSlaves.
+        * khtml/rendering/render_text.cpp:
+        (RenderText::detach): Pass the render arena in to deleteSlaves.
+        (RenderText::deleteSlaves): Use the passed-in arena.
+
+2002-11-13  Darin Adler  <darin at apple.com>
+
 	- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
 
         * khtml/rendering/render_box.cpp: (RenderBox::setStyle): Call renderArena()
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 69e6210..d75865f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-11-13  Darin Adler  <darin at apple.com>
 
+	- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
+
+        * khtml/rendering/render_text.h: Add an optional arena parameter to deleteSlaves.
+        * khtml/rendering/render_text.cpp:
+        (RenderText::detach): Pass the render arena in to deleteSlaves.
+        (RenderText::deleteSlaves): Use the passed-in arena.
+
+2002-11-13  Darin Adler  <darin at apple.com>
+
 	- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
 
         * khtml/rendering/render_box.cpp: (RenderBox::setStyle): Call renderArena()
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 69e6210..d75865f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-11-13  Darin Adler  <darin at apple.com>
 
+	- fixed 3100895 -- REGRESSION: Crash (was assertion) on http://www.w3.org/Style/CSS/
+
+        * khtml/rendering/render_text.h: Add an optional arena parameter to deleteSlaves.
+        * khtml/rendering/render_text.cpp:
+        (RenderText::detach): Pass the render arena in to deleteSlaves.
+        (RenderText::deleteSlaves): Use the passed-in arena.
+
+2002-11-13  Darin Adler  <darin at apple.com>
+
 	- fixed another crash on http://www.w3.org/Style/CSS/, but still not done
 
         * khtml/rendering/render_box.cpp: (RenderBox::setStyle): Call renderArena()
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index 93a14bb..a62172c 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -340,11 +340,11 @@ RenderText::~RenderText()
 
 void RenderText::detach(RenderArena* renderArena)
 {
-    deleteSlaves();
+    deleteSlaves(renderArena);
     RenderObject::detach(renderArena);
 }
 
-void RenderText::deleteSlaves()
+void RenderText::deleteSlaves(RenderArena *arena)
 {
     // this is a slight variant of QArray::clear().
     // We don't delete the array itself here because its
@@ -352,7 +352,8 @@ void RenderText::deleteSlaves()
     // us resize() calls
     unsigned int len = m_lines.size();
     if (len) {
-        RenderArena* arena = renderArena();
+        if (!arena)
+            arena = renderArena();
         for(unsigned int i=0; i < len; i++) {
             TextSlave* s = m_lines.at(i);
             if (s)
diff --git a/WebCore/khtml/rendering/render_text.h b/WebCore/khtml/rendering/render_text.h
index 35d8bc5..c5b8367 100644
--- a/WebCore/khtml/rendering/render_text.h
+++ b/WebCore/khtml/rendering/render_text.h
@@ -138,7 +138,7 @@ public:
     virtual void printObject( QPainter *, int x, int y, int w, int h,
                         int tx, int ty);
 
-    void deleteSlaves();
+    void deleteSlaves(RenderArena *renderArena = 0);
     virtual void detach(RenderArena* renderArena);
     
     DOM::DOMString data() const { return str; }

-- 
WebKit Debian packaging