[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 fdae6899e8a0bdbce769807b1ef2423b18d66980
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 10 15:37:25 2003 +0000

            Reviewed by Don.
    
    	- fixed 3286343 -- REGRESSION: crashing on pages with text area elements
    
            * khtml/rendering/render_form.cpp: (RenderTextArea::detach):
            Do cleanup in detach rather than in destructor.
            * khtml/rendering/render_form.h: Remove destructor, add detach.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4511 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7c21493..b64656d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-06-10  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3286343 -- REGRESSION: crashing on pages with text area elements
+
+        * khtml/rendering/render_form.cpp: (RenderTextArea::detach):
+        Do cleanup in detach rather than in destructor.
+        * khtml/rendering/render_form.h: Remove destructor, add detach.
+
 2003-06-09  Richard Williamson  <rjw at apple.com>
 
 	Fixed 3281761.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7c21493..b64656d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-06-10  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3286343 -- REGRESSION: crashing on pages with text area elements
+
+        * khtml/rendering/render_form.cpp: (RenderTextArea::detach):
+        Do cleanup in detach rather than in destructor.
+        * khtml/rendering/render_form.h: Remove destructor, add detach.
+
 2003-06-09  Richard Williamson  <rjw at apple.com>
 
 	Fixed 3281761.
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index 4ff2be1..e4fc020 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -1295,12 +1295,13 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element)
     connect(edit,SIGNAL(clicked()),this,SLOT(slotClicked()));
 }
 
-RenderTextArea::~RenderTextArea()
+void RenderTextArea::detach(RenderArena *arena)
 {
     if ( element()->m_dirtyvalue ) {
         element()->m_value = text();
         element()->m_dirtyvalue = false;
     }
+    RenderFormElement::detach(arena);
 }
 
 void RenderTextArea::handleFocusOut()
diff --git a/WebCore/khtml/rendering/render_form.h b/WebCore/khtml/rendering/render_form.h
index c673bd3..3f33d69 100644
--- a/WebCore/khtml/rendering/render_form.h
+++ b/WebCore/khtml/rendering/render_form.h
@@ -434,7 +434,8 @@ class RenderTextArea : public RenderFormElement
     Q_OBJECT
 public:
     RenderTextArea(DOM::HTMLTextAreaElementImpl *element);
-    ~RenderTextArea();
+
+    virtual void detach(RenderArena *arena);
 
     virtual const char *renderName() const { return "RenderTextArea"; }
     virtual void calcMinMaxWidth();

-- 
WebKit Debian packaging