[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 e534b01edeaf791f28fe694bb105ca645e99a6c9
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 20 22:48:44 2003 +0000

    Correcting the glitch caused by textareas changing size and add a layout test for the amazon.com colspan table issue.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4859 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/table/003-expected.txt b/LayoutTests/fast/table/003-expected.txt
index 0e82a12..6d36fb8 100644
--- a/LayoutTests/fast/table/003-expected.txt
+++ b/LayoutTests/fast/table/003-expected.txt
@@ -19,23 +19,23 @@ layer at (0,0) size 800x488
         RenderTableSection {TBODY} at (2,2) size 0x100 [bgcolor=#000000]
           RenderTableRow {TR} at (0,0) size 0x0
             RenderTableCell {TD} at (2,48) size 92x4 [r=0 c=0 rs=1 cs=1]
-      RenderTable {TABLE} at (0,154) size 154x124
+      RenderTable {TABLE} at (0,154) size 156x124
         RenderTableSection {TBODY} at (2,2) size 0x120
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,2) size 146x21 [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (2,2) size 148x21 [r=0 c=0 rs=1 cs=1]
               RenderText {TEXT} at (2,2) size 34x17
                 text run at (2,2) width 34: "hello"
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,25) size 146x21 [r=1 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (2,25) size 148x21 [r=1 c=0 rs=1 cs=1]
               RenderText {TEXT} at (2,2) size 74x17
                 text run at (2,2) width 74: "more hello"
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,48) size 146x21 [r=2 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (2,48) size 148x21 [r=2 c=0 rs=1 cs=1]
               RenderText {TEXT} at (2,2) size 38x17
                 text run at (2,2) width 38: "world"
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,71) size 146x47 [r=3 c=0 rs=1 cs=1]
-              RenderTextArea {TEXTAREA} at (4,2) size 138x43
+            RenderTableCell {TD} at (2,71) size 148x47 [r=3 c=0 rs=1 cs=1]
+              RenderTextArea {TEXTAREA} at (4,2) size 140x43
       RenderTable {TABLE} at (0,278) size 106x74
         RenderTableSection {TBODY} at (0,0) size 0x74
           RenderTableRow {TR} at (0,0) size 0x0
diff --git a/LayoutTests/fast/table/038-expected.txt b/LayoutTests/fast/table/038-expected.txt
new file mode 100644
index 0000000..68268f0
--- /dev/null
+++ b/LayoutTests/fast/table/038-expected.txt
@@ -0,0 +1,26 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x102
+  RenderBlock {HTML} at (0,0) size 800x102
+    RenderBody {BODY} at (8,8) size 784x86
+      RenderBlock (anonymous) at (0,0) size 784x34
+        RenderText {TEXT} at (0,0) size 760x34
+          text run at (0,0) width 292: "The two rows below should look identical. "
+          text run at (292,0) width 468: "In both, the spanning cells in columns 2-3 should consume as much"
+          text run at (0,17) width 337: "width as possible, while column 1 should be tiny."
+      RenderTable {TABLE} at (0,34) size 784x52
+        RenderTableSection {TBODY} at (2,2) size 0x48
+          RenderTableRow {TR} at (0,0) size 0x0
+            RenderTableCell {TD} at (2,2) size 13x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {TEXT} at (2,2) size 9x17
+                text run at (2,2) width 9: "1"
+            RenderTableCell {TD} at (17,2) size 761x21 [r=0 c=1 rs=1 cs=2]
+              RenderText {TEXT} at (2,2) size 26x17
+                text run at (2,2) width 26: "2-3"
+          RenderTableRow {TR} at (0,0) size 0x0
+            RenderTableCell {TD} at (2,25) size 13x21 [r=1 c=0 rs=1 cs=1]
+              RenderText {TEXT} at (2,2) size 9x17
+                text run at (2,2) width 9: "1"
+            RenderTableCell {TD} at (17,25) size 761x21 [r=1 c=1 rs=1 cs=2]
+              RenderText {TEXT} at (2,2) size 26x17
+                text run at (2,2) width 26: "2-3"
diff --git a/LayoutTests/fast/table/038.html b/LayoutTests/fast/table/038.html
new file mode 100644
index 0000000..bf6896d
--- /dev/null
+++ b/LayoutTests/fast/table/038.html
@@ -0,0 +1,12 @@
+The two rows below should look identical.  In both, the spanning cells in columns 2-3 should consume as
+much width as possible, while column 1 should be tiny.
+
+<table border=2 width=100%>
+        <tr>
+            <td>1<td colspan=2>2-3
+        </tr>
+        <tr>
+            <td>1</td>
+            <td colspan=2 width=100%>2-3</td>
+        </tr>
+    </table>

-- 
WebKit Debian packaging