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

Sat Sep 26 08:31:40 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit d753ce6b1899ef26743fe3d48452beff9bb58406
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 1 00:00:05 2004 +0000

    	Fix for 3601834, make sure that textareas do a layout when their rows/cols/wrap attributes are dynamically
    	changed.
    
            Reviewed by darin.
    
            * khtml/html/html_formimpl.cpp:
            (HTMLTextAreaElementImpl::parseHTMLAttribute):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/dynamic/008-expected.txt b/LayoutTests/fast/dynamic/008-expected.txt
new file mode 100644
index 0000000..46cf57e
--- /dev/null
+++ b/LayoutTests/fast/dynamic/008-expected.txt
@@ -0,0 +1,10 @@
+layer at (0,0) size 800x672
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x672
+  RenderBlock {HTML} at (0,0) size 800x672
+    RenderBody {BODY} at (8,8) size 784x656
+      RenderTextArea {TEXTAREA} at (2,2) size 306x652
+      RenderText {TEXT} at (0,0) size 0x0
+      RenderText {TEXT} at (0,0) size 0x0
+      RenderText {TEXT} at (0,0) size 0x0
+      RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/fast/dynamic/008.html b/LayoutTests/fast/dynamic/008.html
new file mode 100644
index 0000000..6bb34c0
--- /dev/null
+++ b/LayoutTests/fast/dynamic/008.html
@@ -0,0 +1,12 @@
+<html>
+<body>
+<textarea id="ta" rows=10 cols=40>Sample text</textarea>
+<script>
+var v = document.getElementById('ta');
+var w = v.offsetWidth; // Force a layout
+v.rows += 40; // Change the rows again.
+w = v.offsetWidth; // Force a layout again.
+</script>
+</body>
+</html>
+
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 32cff56..2a663d4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-03-31  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3601834, make sure that textareas do a layout when their rows/cols/wrap attributes are dynamically
+	changed.
+	
+        Reviewed by darin.
+
+        * khtml/html/html_formimpl.cpp:
+        (HTMLTextAreaElementImpl::parseHTMLAttribute):
+
 2004-03-30  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3604241, simple space collapsing results in a doubled character.  Simplify the ignoring of
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index bf7ce9c..07a19a5 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -2764,9 +2764,13 @@ void HTMLTextAreaElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
     {
     case ATTR_ROWS:
         m_rows = !attr->isNull() ? attr->value().toInt() : 3;
+        if (renderer())
+            renderer()->setNeedsLayoutAndMinMaxRecalc();
         break;
     case ATTR_COLS:
         m_cols = !attr->isNull() ? attr->value().toInt() : 60;
+        if (renderer())
+            renderer()->setNeedsLayoutAndMinMaxRecalc();
         break;
     case ATTR_WRAP:
         // virtual / physical is Netscape extension of HTML 3.0, now deprecated
@@ -2779,6 +2783,8 @@ void HTMLTextAreaElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
             m_wrap = ta_Physical;
         else if(strcasecmp( attr->value(), "off") == 0)
             m_wrap = ta_NoWrap;
+        if (renderer())
+            renderer()->setNeedsLayoutAndMinMaxRecalc();
         break;
     case ATTR_ACCESSKEY:
         // ignore for the moment

-- 
WebKit Debian packaging

