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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit c30857cf82e7d63274a6f8a77aedcb859ae8e8f9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 15 21:32:32 2002 +0000

    	Fix newlines getting stripped out of textareas by not making
    	rendertext objects for children of textareas.
    
            * khtml/rendering/render_form.h:
            * khtml/rendering/render_object.h:
            * khtml/xml/dom_textimpl.cpp:
            (TextImpl::attach):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2700 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7054504..576dec9 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix newlines getting stripped out of textareas by not making
+	rendertext objects for children of textareas.
+	
+        * khtml/rendering/render_form.h:
+        * khtml/rendering/render_object.h:
+        * khtml/xml/dom_textimpl.cpp:
+        (TextImpl::attach):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Make <form> inside <table> stay inside the <table> but demote
 	itself to a leaf.  Then the children of the <form> are treated
 	as though they occurred underneath the <table> itself.  Everything
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7054504..576dec9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix newlines getting stripped out of textareas by not making
+	rendertext objects for children of textareas.
+	
+        * khtml/rendering/render_form.h:
+        * khtml/rendering/render_object.h:
+        * khtml/xml/dom_textimpl.cpp:
+        (TextImpl::attach):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Make <form> inside <table> stay inside the <table> but demote
 	itself to a leaf.  Then the children of the <form> are treated
 	as though they occurred underneath the <table> itself.  Everything
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7054504..576dec9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-11-15  David Hyatt  <hyatt at apple.com>
 
+	Fix newlines getting stripped out of textareas by not making
+	rendertext objects for children of textareas.
+	
+        * khtml/rendering/render_form.h:
+        * khtml/rendering/render_object.h:
+        * khtml/xml/dom_textimpl.cpp:
+        (TextImpl::attach):
+
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
 	Make <form> inside <table> stay inside the <table> but demote
 	itself to a leaf.  Then the children of the <form> are treated
 	as though they occurred underneath the <table> itself.  Everything
diff --git a/WebCore/khtml/rendering/render_form.h b/WebCore/khtml/rendering/render_form.h
index 09813f7..1ec0c37 100644
--- a/WebCore/khtml/rendering/render_form.h
+++ b/WebCore/khtml/rendering/render_form.h
@@ -398,6 +398,8 @@ public:
     virtual void close ( );
     virtual void updateFromElement();
 
+    virtual bool isTextArea() const { return true; }
+    
     // don't even think about making this method virtual!
     DOM::HTMLTextAreaElementImpl* element() const
     { return static_cast<DOM::HTMLTextAreaElementImpl*>(RenderObject::element()); }
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 744d25b..5f37b87 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -153,6 +153,7 @@ public:
     virtual bool isWidget() const { return false; }
     virtual bool isBody() const { return false; }
     virtual bool isFormElement() const { return false; }
+    virtual bool isTextArea() const { return false; }
     virtual bool isFrameSet() const { return false; }
     virtual bool isApplet() const { return false; }
 
diff --git a/WebCore/khtml/xml/dom_textimpl.cpp b/WebCore/khtml/xml/dom_textimpl.cpp
index 0423d4a..7c49e61 100644
--- a/WebCore/khtml/xml/dom_textimpl.cpp
+++ b/WebCore/khtml/xml/dom_textimpl.cpp
@@ -363,7 +363,7 @@ void TextImpl::attach()
     assert(parentNode() && parentNode()->isElementNode());
 
     ElementImpl* element = static_cast<ElementImpl*>(parentNode());
-    if (!m_render && element->renderer()) {
+    if (!m_render && element->renderer() && !element->renderer()->isTextArea()) {
         RenderObject* par = element->renderer();
         khtml::RenderStyle* _style = par->style();
         bool onlyWS = containsOnlyWhitespace();

-- 
WebKit Debian packaging