[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

tkent at chromium.org tkent at chromium.org
Thu Feb 4 21:27:51 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit b214c543c266caf20b36a88cdb05194bc1fce5b7
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 26 09:42:38 2010 +0000

    2010-01-26  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Shinichiro Hamaji.
    
            Convert textarea-rows-cols.html to dumpAsText()
            https://bugs.webkit.org/show_bug.cgi?id=34074
    
            * fast/forms/script-tests/textarea-rows-cols.js: Added.
            * fast/forms/textarea-rows-cols-expected.txt: Added.
            * fast/forms/textarea-rows-cols.html:
            * platform/mac/fast/forms/textarea-rows-cols-expected.checksum: Removed.
            * platform/mac/fast/forms/textarea-rows-cols-expected.png: Removed.
            * platform/mac/fast/forms/textarea-rows-cols-expected.txt: Removed.
            * platform/qt/fast/forms/textarea-rows-cols-expected.txt: Removed.
            * platform/win/fast/forms/textarea-rows-cols-expected.txt: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53844 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0e8b124..bc80e2c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-26  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Convert textarea-rows-cols.html to dumpAsText()
+        https://bugs.webkit.org/show_bug.cgi?id=34074
+
+        * fast/forms/script-tests/textarea-rows-cols.js: Added.
+        * fast/forms/textarea-rows-cols-expected.txt: Added.
+        * fast/forms/textarea-rows-cols.html:
+        * platform/mac/fast/forms/textarea-rows-cols-expected.checksum: Removed.
+        * platform/mac/fast/forms/textarea-rows-cols-expected.png: Removed.
+        * platform/mac/fast/forms/textarea-rows-cols-expected.txt: Removed.
+        * platform/qt/fast/forms/textarea-rows-cols-expected.txt: Removed.
+        * platform/win/fast/forms/textarea-rows-cols-expected.txt: Removed.
+
 2010-01-22  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/forms/script-tests/textarea-rows-cols.js b/LayoutTests/fast/forms/script-tests/textarea-rows-cols.js
new file mode 100644
index 0000000..e6faae1
--- /dev/null
+++ b/LayoutTests/fast/forms/script-tests/textarea-rows-cols.js
@@ -0,0 +1,126 @@
+description('Test for edge cases of &lt;textarea&gt; rows and cols attributes.');
+
+var parent = document.createElement('div');
+document.body.appendChild(parent);
+parent.innerHTML = '<textarea>default</textarea>';
+
+debug('Default values');
+var textarea = parent.firstChild;
+var defaultRows = textarea.rows;
+var defaultCols = textarea.cols;
+var defaultHeight = textarea.offsetHeight;
+var defaultWidth = textarea.offsetWidth;
+var defaultScrollHeight = textarea.scrollHeight;
+var defaultScrollWidth = textarea.scrollWidth;
+shouldBe('defaultRows', '2');
+shouldBe('defaultCols', '20');
+shouldBeTrue('defaultHeight > 0');
+shouldBeTrue('defaultWidth > 0');
+shouldBeTrue('defaultScrollHeight > 0');
+shouldBeTrue('defaultScrollWidth > 0');
+shouldBeTrue('defaultScrollHeight < defaultHeight');
+shouldBeTrue('defaultScrollWidth < defaultWidth');
+
+debug('rows = 1');
+parent.innerHTML = '<textarea rows="1">rows = 1</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.rows', '1');
+shouldBeTrue('textarea.offsetHeight > 0');
+shouldBeTrue('textarea.offsetHeight < defaultHeight');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+
+debug('rows = 2; should match default height');
+parent.innerHTML = '<textarea rows="2">rows = 2; should match default height</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.rows', 'defaultRows');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+
+debug('rows = 3');
+parent.innerHTML = '<textarea rows="3">rows = 3</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.rows', '3');
+shouldBeTrue('textarea.offsetHeight > defaultHeight');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+
+debug('rows; should be default height');
+parent.innerHTML = '<textarea rows>rows; should be default height</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.rows', 'defaultRows');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+
+debug('rows = 0; should be default height');
+parent.innerHTML = '<textarea rows="0">rows = 0; should be default height</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.rows', 'defaultRows');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+
+debug('rows = -1; should be default height');
+parent.innerHTML = '<textarea rows="-1">rows = -1; should be default height</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.rows', 'defaultRows');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+
+debug('rows = x; should be default height');
+parent.innerHTML = '<textarea rows="x">rows = x; should be default height</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.rows', 'defaultRows');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+
+debug('cols = 1');
+parent.innerHTML = '<textarea cols="1">cols = 1</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.cols', '1');
+shouldBeTrue('textarea.offsetWidth > 0');
+shouldBeTrue('textarea.offsetWidth < defaultWidth');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+shouldBeTrue('textarea.scrollHeight > defaultScrollHeight');
+shouldBeTrue('textarea.scrollWidth < defaultScrollWidth');
+
+debug('cols = 20; should match default width');
+parent.innerHTML = '<textarea cols="20">cols = 20; should match default width</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.cols', 'defaultCols');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+
+debug('cols = 40');
+parent.innerHTML = '<textarea cols="40">cols = 40</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.cols', '40');
+shouldBeTrue('textarea.offsetWidth > defaultWidth');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+
+debug('cols; should be default width');
+parent.innerHTML = '<textarea cols>cols; should be default width</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.cols', 'defaultCols');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+
+debug('cols = 0; should be default width');
+parent.innerHTML = '<textarea cols="0">cols = 0; should be default width</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.cols', 'defaultCols');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+
+debug('cols = -1; should be default width');
+parent.innerHTML = '<textarea cols="-1">cols = -1; should be default width</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.cols', 'defaultCols');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+
+debug('cols = x; should be default width');
+parent.innerHTML = '<textarea cols="x">cols = x; should be default width</textarea>';
+textarea = parent.firstChild;
+shouldBe('textarea.cols', 'defaultCols');
+shouldBe('textarea.offsetWidth', 'defaultWidth');
+shouldBe('textarea.offsetHeight', 'defaultHeight');
+
+var successfullyParsed = true;
diff --git a/LayoutTests/fast/forms/textarea-rows-cols-expected.txt b/LayoutTests/fast/forms/textarea-rows-cols-expected.txt
new file mode 100644
index 0000000..0948fe6
--- /dev/null
+++ b/LayoutTests/fast/forms/textarea-rows-cols-expected.txt
@@ -0,0 +1,78 @@
+Test for edge cases of <textarea> rows and cols attributes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Default values
+PASS defaultRows is 2
+PASS defaultCols is 20
+PASS defaultHeight > 0 is true
+PASS defaultWidth > 0 is true
+PASS defaultScrollHeight > 0 is true
+PASS defaultScrollWidth > 0 is true
+PASS defaultScrollHeight < defaultHeight is true
+PASS defaultScrollWidth < defaultWidth is true
+rows = 1
+PASS textarea.rows is 1
+PASS textarea.offsetHeight > 0 is true
+PASS textarea.offsetHeight < defaultHeight is true
+PASS textarea.offsetWidth is defaultWidth
+rows = 2; should match default height
+PASS textarea.rows is defaultRows
+PASS textarea.offsetHeight is defaultHeight
+PASS textarea.offsetWidth is defaultWidth
+rows = 3
+PASS textarea.rows is 3
+PASS textarea.offsetHeight > defaultHeight is true
+PASS textarea.offsetWidth is defaultWidth
+rows; should be default height
+PASS textarea.rows is defaultRows
+PASS textarea.offsetHeight is defaultHeight
+PASS textarea.offsetWidth is defaultWidth
+rows = 0; should be default height
+PASS textarea.rows is defaultRows
+PASS textarea.offsetHeight is defaultHeight
+PASS textarea.offsetWidth is defaultWidth
+rows = -1; should be default height
+PASS textarea.rows is defaultRows
+PASS textarea.offsetHeight is defaultHeight
+PASS textarea.offsetWidth is defaultWidth
+rows = x; should be default height
+PASS textarea.rows is defaultRows
+PASS textarea.offsetHeight is defaultHeight
+PASS textarea.offsetWidth is defaultWidth
+cols = 1
+PASS textarea.cols is 1
+PASS textarea.offsetWidth > 0 is true
+PASS textarea.offsetWidth < defaultWidth is true
+PASS textarea.offsetHeight is defaultHeight
+PASS textarea.scrollHeight > defaultScrollHeight is true
+PASS textarea.scrollWidth < defaultScrollWidth is true
+cols = 20; should match default width
+PASS textarea.cols is defaultCols
+PASS textarea.offsetWidth is defaultWidth
+PASS textarea.offsetHeight is defaultHeight
+cols = 40
+PASS textarea.cols is 40
+PASS textarea.offsetWidth > defaultWidth is true
+PASS textarea.offsetHeight is defaultHeight
+cols; should be default width
+PASS textarea.cols is defaultCols
+PASS textarea.offsetWidth is defaultWidth
+PASS textarea.offsetHeight is defaultHeight
+cols = 0; should be default width
+PASS textarea.cols is defaultCols
+PASS textarea.offsetWidth is defaultWidth
+PASS textarea.offsetHeight is defaultHeight
+cols = -1; should be default width
+PASS textarea.cols is defaultCols
+PASS textarea.offsetWidth is defaultWidth
+PASS textarea.offsetHeight is defaultHeight
+cols = x; should be default width
+PASS textarea.cols is defaultCols
+PASS textarea.offsetWidth is defaultWidth
+PASS textarea.offsetHeight is defaultHeight
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/forms/textarea-rows-cols.html b/LayoutTests/fast/forms/textarea-rows-cols.html
index 585de3e..658a9be 100644
--- a/LayoutTests/fast/forms/textarea-rows-cols.html
+++ b/LayoutTests/fast/forms/textarea-rows-cols.html
@@ -1,25 +1,13 @@
-<div>Test for edge cases of &lt;textarea&gt; rows and cols attributes.</div>
-
-<hr>
-
-<div><textarea>default height</textarea></div>
-<div><textarea rows="1">rows = 1</textarea></div>
-<div><textarea rows="2">rows = 2; should match default height</textarea></div>
-<div><textarea rows="3">rows = 3</textarea></div>
-<div><textarea rows>rows; should be default height</textarea></div>
-<div><textarea rows="0">rows = 0; should be default height</textarea></div>
-<div><textarea rows="-1">rows = -1; should be default height</textarea></div>
-<div><textarea rows="x">rows = x; should be default height</textarea></div>
-
-<hr>
-
-<div><textarea>default width</textarea></div>
-<div><textarea cols="1">cols = 1</textarea></div>
-<div><textarea cols="20">cols = 20; should match default width</textarea></div>
-<div><textarea cols="40">cols = 40</textarea></div>
-<div><textarea cols>cols; should be default width</textarea></div>
-<div><textarea cols="0">cols = 0; should be default width</textarea></div>
-<div><textarea cols="-1">cols = -1; should be default width</textarea></div>
-<div><textarea cols="x">cols = x; should be default width</textarea></div>
-
-<hr>
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
+<script src="../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/textarea-rows-cols.js"></script>
+<script src="../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.checksum b/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.checksum
deleted file mode 100644
index 1150886..0000000
--- a/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-604fc62657fe1d571133035e53fde481
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.png b/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.png
deleted file mode 100644
index 4f387da..0000000
Binary files a/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.txt b/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.txt
deleted file mode 100644
index ced6891..0000000
--- a/LayoutTests/platform/mac/fast/forms/textarea-rows-cols-expected.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-layer at (0,0) size 785x656
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x656
-  RenderBlock {HTML} at (0,0) size 785x656
-    RenderBody {BODY} at (8,8) size 769x640
-      RenderBlock {DIV} at (0,0) size 769x18
-        RenderText {#text} at (0,0) size 364x18
-          text run at (0,0) width 364: "Test for edge cases of <textarea> rows and cols attributes."
-      RenderBlock {HR} at (0,26) size 769x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (0,36) size 769x36
-      RenderBlock {DIV} at (0,72) size 769x23
-      RenderBlock {DIV} at (0,95) size 769x36
-      RenderBlock {DIV} at (0,131) size 769x49
-      RenderBlock {DIV} at (0,180) size 769x36
-      RenderBlock {DIV} at (0,216) size 769x36
-      RenderBlock {DIV} at (0,252) size 769x36
-      RenderBlock {DIV} at (0,288) size 769x36
-      RenderBlock {HR} at (0,332) size 769x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (0,342) size 769x36
-      RenderBlock {DIV} at (0,378) size 769x36
-      RenderBlock {DIV} at (0,414) size 769x36
-      RenderBlock {DIV} at (0,450) size 769x36
-      RenderBlock {DIV} at (0,486) size 769x36
-      RenderBlock {DIV} at (0,522) size 769x36
-      RenderBlock {DIV} at (0,558) size 769x36
-      RenderBlock {DIV} at (0,594) size 769x36
-      RenderBlock {HR} at (0,638) size 769x2 [border: (1px inset #000000)]
-layer at (10,46) size 129x32 clip at (11,47) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x13
-      RenderText {#text} at (0,0) size 75x13
-        text run at (0,0) width 75: "default height"
-layer at (10,82) size 129x19 clip at (11,83) size 127x17
-  RenderTextControl {TEXTAREA} at (2,2) size 129x19 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x13
-      RenderText {#text} at (0,0) size 48x13
-        text run at (0,0) width 48: "rows = 1"
-layer at (10,105) size 129x32 clip at (11,106) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 111x26
-        text run at (0,0) width 92: "rows = 2; should"
-        text run at (92,0) width 3: " "
-        text run at (0,13) width 111: "match default height"
-layer at (10,141) size 129x45 clip at (11,142) size 127x43
-  RenderTextControl {TEXTAREA} at (2,2) size 129x45 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x13
-      RenderText {#text} at (0,0) size 48x13
-        text run at (0,0) width 48: "rows = 3"
-layer at (10,190) size 129x32 clip at (11,191) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 89x26
-        text run at (0,0) width 86: "rows; should be"
-        text run at (86,0) width 3: " "
-        text run at (0,13) width 75: "default height"
-layer at (10,226) size 129x32 clip at (11,227) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 112x26
-        text run at (0,0) width 109: "rows = 0; should be"
-        text run at (109,0) width 3: " "
-        text run at (0,13) width 75: "default height"
-layer at (10,262) size 129x32 clip at (11,263) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 119x26
-        text run at (0,0) width 116: "rows = -1; should be"
-        text run at (116,0) width 3: " "
-        text run at (0,13) width 75: "default height"
-layer at (10,298) size 129x32 clip at (11,299) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 112x26
-        text run at (0,0) width 109: "rows = x; should be"
-        text run at (109,0) width 3: " "
-        text run at (0,13) width 75: "default height"
-layer at (10,352) size 129x32 clip at (11,353) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x13
-      RenderText {#text} at (0,0) size 71x13
-        text run at (0,0) width 71: "default width"
-layer at (10,388) size 27x32 clip at (11,389) size 10x15 scrollWidth 11 scrollHeight 82
-  RenderTextControl {TEXTAREA} at (2,2) size 27x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 6x78
-      RenderText {#text} at (0,0) size 9x78
-        text run at (0,0) width 6: "c"
-        text run at (0,13) width 7: "o"
-        text run at (0,26) width 4: "l"
-        text run at (0,39) width 6: "s"
-        text run at (6,39) width 0: " "
-        text run at (0,52) width 9: "="
-        text run at (0,65) width 7: "1"
-layer at (10,424) size 129x32 clip at (11,425) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 107x26
-        text run at (0,0) width 95: "cols = 20; should"
-        text run at (95,0) width 3: " "
-        text run at (0,13) width 107: "match default width"
-layer at (10,460) size 237x32 clip at (11,461) size 235x30
-  RenderTextControl {TEXTAREA} at (2,2) size 237x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 231x13
-      RenderText {#text} at (0,0) size 51x13
-        text run at (0,0) width 51: "cols = 40"
-layer at (10,496) size 129x32 clip at (11,497) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 123x26
-        text run at (0,0) width 123: "cols; should be default"
-        text run at (123,0) width 0: " "
-        text run at (0,13) width 30: "width"
-layer at (10,532) size 129x32 clip at (11,533) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 108x26
-        text run at (0,0) width 105: "cols = 0; should be"
-        text run at (105,0) width 3: " "
-        text run at (0,13) width 71: "default width"
-layer at (10,568) size 129x32 clip at (11,569) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 115x26
-        text run at (0,0) width 112: "cols = -1; should be"
-        text run at (112,0) width 3: " "
-        text run at (0,13) width 71: "default width"
-layer at (10,604) size 129x32 clip at (11,605) size 127x30
-  RenderTextControl {TEXTAREA} at (2,2) size 129x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 123x26
-      RenderText {#text} at (0,0) size 108x26
-        text run at (0,0) width 105: "cols = x; should be"
-        text run at (105,0) width 3: " "
-        text run at (0,13) width 71: "default width"
diff --git a/LayoutTests/platform/qt/fast/forms/textarea-rows-cols-expected.txt b/LayoutTests/platform/qt/fast/forms/textarea-rows-cols-expected.txt
deleted file mode 100644
index b2c2568..0000000
--- a/LayoutTests/platform/qt/fast/forms/textarea-rows-cols-expected.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-layer at (0,0) size 800x780
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x780
-  RenderBlock {HTML} at (0,0) size 800x780
-    RenderBody {BODY} at (8,8) size 784x764
-      RenderBlock {DIV} at (0,0) size 784x19
-        RenderText {#text} at (0,0) size 372x19
-          text run at (0,0) width 372: "Test for edge cases of <textarea> rows and cols attributes."
-      RenderBlock {HR} at (0,26) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (0,35) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,79) size 784x25
-        RenderTextControl {TEXTAREA} at (2,2) size 184x21 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,104) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,148) size 784x63
-        RenderTextControl {TEXTAREA} at (2,2) size 184x59 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,211) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,255) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,299) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,343) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {HR} at (0,394) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (0,403) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,447) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 32x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,491) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,535) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 344x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,579) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,623) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,667) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {DIV} at (0,711) size 784x44
-        RenderTextControl {TEXTAREA} at (2,2) size 184x40 [border: (1px solid #000000)]
-      RenderBlock {HR} at (0,762) size 784x2 [border: (1px inset #000000)]
-layer at (11,46) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 86x19
-      text run at (3,0) width 86: "default height"
-layer at (11,90) size 182x19
-  RenderBlock {DIV} at (1,1) size 182x19
-    RenderText {#text} at (3,0) size 54x19
-      text run at (3,0) width 54: "rows = 1"
-layer at (11,115) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 151x38
-      text run at (3,0) width 151: "rows = 2; should match "
-      text run at (3,19) width 86: "default height"
-layer at (11,159) size 182x57
-  RenderBlock {DIV} at (1,1) size 182x57
-    RenderText {#text} at (3,0) size 54x19
-      text run at (3,0) width 54: "rows = 3"
-layer at (11,222) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 151x38
-      text run at (3,0) width 151: "rows; should be default "
-      text run at (3,19) width 39: "height"
-layer at (11,266) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 175x38
-      text run at (3,0) width 175: "rows = 0; should be default "
-      text run at (3,19) width 39: "height"
-layer at (11,310) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 176x38
-      text run at (3,0) width 176: "rows = -1; should be default"
-      text run at (179,0) width 0: " "
-      text run at (3,19) width 39: "height"
-layer at (11,354) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 174x38
-      text run at (3,0) width 174: "rows = x; should be default "
-      text run at (3,19) width 39: "height"
-layer at (11,414) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 80x19
-      text run at (3,0) width 80: "default width"
-layer at (11,458) size 30x38 clip at (11,458) size 14x38 scrollHeight 114
-  RenderBlock {DIV} at (1,1) size 30x38
-    RenderText {#text} at (3,0) size 8x114
-      text run at (3,0) width 7: "c"
-      text run at (3,19) width 8: "o"
-      text run at (3,38) width 3: "l"
-      text run at (3,57) width 8: "s "
-      text run at (3,76) width 8: "= "
-      text run at (3,95) width 8: "1"
-layer at (11,502) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 154x38
-      text run at (3,0) width 154: "cols = 20; should match "
-      text run at (3,19) width 80: "default width"
-layer at (11,546) size 342x38
-  RenderBlock {DIV} at (1,1) size 342x38
-    RenderText {#text} at (3,0) size 57x19
-      text run at (3,0) width 57: "cols = 40"
-layer at (11,590) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 146x38
-      text run at (3,0) width 146: "cols; should be default "
-      text run at (3,19) width 33: "width"
-layer at (11,634) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 170x38
-      text run at (3,0) width 170: "cols = 0; should be default "
-      text run at (3,19) width 33: "width"
-layer at (11,678) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 175x38
-      text run at (3,0) width 175: "cols = -1; should be default "
-      text run at (3,19) width 33: "width"
-layer at (11,722) size 182x38
-  RenderBlock {DIV} at (1,1) size 182x38
-    RenderText {#text} at (3,0) size 169x38
-      text run at (3,0) width 169: "cols = x; should be default "
-      text run at (3,19) width 33: "width"
diff --git a/LayoutTests/platform/win/fast/forms/textarea-rows-cols-expected.txt b/LayoutTests/platform/win/fast/forms/textarea-rows-cols-expected.txt
deleted file mode 100644
index de1e3f9..0000000
--- a/LayoutTests/platform/win/fast/forms/textarea-rows-cols-expected.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-layer at (0,0) size 785x656
-  RenderView at (0,0) size 785x600
-layer at (0,0) size 785x656
-  RenderBlock {HTML} at (0,0) size 785x656
-    RenderBody {BODY} at (8,8) size 769x640
-      RenderBlock {DIV} at (0,0) size 769x18
-        RenderText {#text} at (0,0) size 364x18
-          text run at (0,0) width 364: "Test for edge cases of <textarea> rows and cols attributes."
-      RenderBlock {HR} at (0,26) size 769x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (0,36) size 769x36
-      RenderBlock {DIV} at (0,72) size 769x23
-      RenderBlock {DIV} at (0,95) size 769x36
-      RenderBlock {DIV} at (0,131) size 769x49
-      RenderBlock {DIV} at (0,180) size 769x36
-      RenderBlock {DIV} at (0,216) size 769x36
-      RenderBlock {DIV} at (0,252) size 769x36
-      RenderBlock {DIV} at (0,288) size 769x36
-      RenderBlock {HR} at (0,332) size 769x2 [border: (1px inset #000000)]
-      RenderBlock {DIV} at (0,342) size 769x36
-      RenderBlock {DIV} at (0,378) size 769x36
-      RenderBlock {DIV} at (0,414) size 769x36
-      RenderBlock {DIV} at (0,450) size 769x36
-      RenderBlock {DIV} at (0,486) size 769x36
-      RenderBlock {DIV} at (0,522) size 769x36
-      RenderBlock {DIV} at (0,558) size 769x36
-      RenderBlock {DIV} at (0,594) size 769x36
-      RenderBlock {HR} at (0,638) size 769x2 [border: (1px inset #000000)]
-layer at (10,46) size 161x32 clip at (11,47) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x13
-      RenderText {#text} at (0,0) size 75x13
-        text run at (0,0) width 75: "default height"
-layer at (10,82) size 161x19 clip at (11,83) size 159x17
-  RenderTextControl {TEXTAREA} at (2,2) size 161x19 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x13
-      RenderText {#text} at (0,0) size 48x13
-        text run at (0,0) width 48: "rows = 1"
-layer at (10,105) size 161x32 clip at (11,106) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 131x26
-        text run at (0,0) width 128: "rows = 2; should match"
-        text run at (128,0) width 3: " "
-        text run at (0,13) width 75: "default height"
-layer at (10,141) size 161x45 clip at (11,142) size 159x43
-  RenderTextControl {TEXTAREA} at (2,2) size 161x45 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x13
-      RenderText {#text} at (0,0) size 48x13
-        text run at (0,0) width 48: "rows = 3"
-layer at (10,190) size 161x32 clip at (11,191) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 130x26
-        text run at (0,0) width 127: "rows; should be default"
-        text run at (127,0) width 3: " "
-        text run at (0,13) width 34: "height"
-layer at (10,226) size 161x32 clip at (11,227) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 153x26
-        text run at (0,0) width 150: "rows = 0; should be default"
-        text run at (150,0) width 3: " "
-        text run at (0,13) width 34: "height"
-layer at (10,262) size 161x32 clip at (11,263) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 119x26
-        text run at (0,0) width 116: "rows = -1; should be"
-        text run at (116,0) width 3: " "
-        text run at (0,13) width 75: "default height"
-layer at (10,298) size 161x32 clip at (11,299) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 153x26
-        text run at (0,0) width 150: "rows = x; should be default"
-        text run at (150,0) width 3: " "
-        text run at (0,13) width 34: "height"
-layer at (10,352) size 161x32 clip at (11,353) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x13
-      RenderText {#text} at (0,0) size 71x13
-        text run at (0,0) width 71: "default width"
-layer at (10,388) size 28x32 clip at (11,389) size 26x30
-  RenderTextControl {TEXTAREA} at (2,2) size 28x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 22x26
-      RenderText {#text} at (0,0) size 22x26
-        text run at (0,0) width 22: "cols"
-        text run at (22,0) width 0: " "
-        text run at (0,13) width 19: "= 1"
-layer at (10,424) size 161x32 clip at (11,425) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 134x26
-        text run at (0,0) width 131: "cols = 20; should match"
-        text run at (131,0) width 3: " "
-        text run at (0,13) width 71: "default width"
-layer at (10,460) size 300x32 clip at (11,461) size 298x30
-  RenderTextControl {TEXTAREA} at (2,2) size 300x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 294x13
-      RenderText {#text} at (0,0) size 51x13
-        text run at (0,0) width 51: "cols = 40"
-layer at (10,496) size 161x32 clip at (11,497) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 126x26
-        text run at (0,0) width 123: "cols; should be default"
-        text run at (123,0) width 3: " "
-        text run at (0,13) width 30: "width"
-layer at (10,532) size 161x32 clip at (11,533) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 149x26
-        text run at (0,0) width 146: "cols = 0; should be default"
-        text run at (146,0) width 3: " "
-        text run at (0,13) width 30: "width"
-layer at (10,568) size 161x32 clip at (11,569) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 155x26
-        text run at (0,0) width 153: "cols = -1; should be default"
-        text run at (153,0) width 2: " "
-        text run at (0,13) width 30: "width"
-layer at (10,604) size 161x32 clip at (11,605) size 159x30
-  RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
-    RenderBlock {DIV} at (3,3) size 155x26
-      RenderText {#text} at (0,0) size 149x26
-        text run at (0,0) width 146: "cols = x; should be default"
-        text run at (146,0) width 3: " "
-        text run at (0,13) width 30: "width"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list