Diff
Modified: trunk/LayoutTests/ChangeLog (87266 => 87267)
--- trunk/LayoutTests/ChangeLog 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/ChangeLog 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,3 +1,40 @@
+2011-05-24 Kent Tamura <[email protected]>
+
+ Reviewed by Hajime Morita.
+
+ Convert fast/forms/input-type-change.html to a dumpAsText() test
+ https://bugs.webkit.org/show_bug.cgi?id=61029
+
+ Merge input-type-change2 to input-type-change.html, and convert it to
+ a dumpAsText() test.
+
+ * fast/forms/input-type-change-expected.txt:
+ * fast/forms/input-type-change.html:
+ * fast/forms/input-type-change2.html: Removed.
+ * platform/chromium-linux/fast/forms/input-type-change-expected.png: Removed.
+ * platform/chromium-linux/fast/forms/input-type-change2-expected.png: Removed.
+ * platform/chromium-mac-leopard/fast/forms/input-type-change-expected.png: Removed.
+ * platform/chromium-mac/fast/forms/input-type-change-expected.png: Removed.
+ * platform/chromium-win/fast/forms/input-type-change-expected.png: Removed.
+ * platform/chromium-win/fast/forms/input-type-change-expected.txt: Removed.
+ * platform/chromium-win/fast/forms/input-type-change2-expected.png: Removed.
+ * platform/chromium-win/fast/forms/input-type-change2-expected.txt: Removed.
+ * platform/gtk/fast/forms/input-type-change-expected.png: Removed.
+ * platform/gtk/fast/forms/input-type-change-expected.txt: Removed.
+ * platform/gtk/fast/forms/input-type-change2-expected.png: Removed.
+ * platform/gtk/fast/forms/input-type-change2-expected.txt: Removed.
+ * platform/mac-leopard/fast/forms/input-type-change-expected.png: Removed.
+ * platform/mac-leopard/fast/forms/input-type-change2-expected.png: Removed.
+ * platform/mac/fast/forms/input-type-change-expected.png: Removed.
+ * platform/mac/fast/forms/input-type-change-expected.txt:
+ * platform/mac/fast/forms/input-type-change-expected.txt: Removed.
+ * platform/mac/fast/forms/input-type-change2-expected.png: Removed.
+ * platform/mac/fast/forms/input-type-change2-expected.txt: Removed.
+ * platform/qt-arm/Skipped: Remove input-type-change2.html.
+ * platform/qt-mac/Skipped: ditto.
+ * platform/qt/fast/forms/input-type-change-expected.txt: Removed.
+ * platform/qt/fast/forms/input-type-change2-expected.txt: Removed.
+
2011-05-24 Julien Chaffraix <[email protected]>
Reviewed by Hajime Morita.
Added: trunk/LayoutTests/fast/forms/input-type-change-expected.txt (0 => 87267)
--- trunk/LayoutTests/fast/forms/input-type-change-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/input-type-change-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -0,0 +1,16 @@
+Test the changing of an input type=TEXT to type=IMAGE, and vice versa. This test is to make sure that the height and width attributes are used for only IMAGE type.
+
+Check metrics before the change:
+PASS text.offsetWidth == 19 is false
+PASS text.offsetHeight == 17 is false
+PASS image.offsetWidth is 19
+PASS image.offsetHeight is 17
+Check metrics after the change:
+PASS text.offsetWidth is 19
+PASS text.offsetHeight is 17
+PASS image.offsetWidth == 19 is false
+PASS image.offsetHeight == 17 is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: trunk/LayoutTests/fast/forms/input-type-change.html (87266 => 87267)
--- trunk/LayoutTests/fast/forms/input-type-change.html 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/fast/forms/input-type-change.html 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,16 +1,42 @@
<html>
<head>
+<link rel="stylesheet" href=""
+<script src=""
+</head>
+<body _onload_="change()">
+<p>Test the changing of an input type=TEXT to type=IMAGE, and vice versa. This test is to make sure that
+the height and width attributes are used for only IMAGE type.</p>
+<div id=console></div>
+<form id=parent>
+<input id="text" type="text" src="" height="17" width="19">
+<input id="image" type="image" src="" height="17" width="19">
+</form>
<script>
+window.jsTestIsAsync = true;
+var text = document.getElementById('text');
+var image = document.getElementById('image');
+
function change() {
- document.getElementById("im").type="image";
+ debug('Check metrics before the change:');
+ shouldBeFalse('text.offsetWidth == 19');
+ shouldBeFalse('text.offsetHeight == 17');
+ shouldBe('image.offsetWidth', '19');
+ shouldBe('image.offsetHeight', '17');
+
+ text.type = 'image';
+ image.type = 'text';
+ debug('Check metrics after the change:');
+ shouldBe('text.offsetWidth', '19');
+ shouldBe('text.offsetHeight', '17');
+ shouldBeFalse('image.offsetWidth == 19');
+ shouldBeFalse('image.offsetHeight == 17');
+
+ document.body.removeChild(document.getElementById('parent'));
+ finishJSTest();
}
+
+var successfullyParsed = true;
</script>
-</head>
-<body _onload_="change()">
-Test the changing of an input type=TEXT to type=IMAGE. This test is to make sure that
-the height and width attributes are used for the new type of IMAGE.
-<form>
-<br>input element <input id="im" type="text" src="" height="17" width="19">
-</form>
+<script src=""
</body>
</html>
Deleted: trunk/LayoutTests/fast/forms/input-type-change2.html (87266 => 87267)
--- trunk/LayoutTests/fast/forms/input-type-change2.html 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/fast/forms/input-type-change2.html 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,16 +0,0 @@
-<html>
-<head>
-<script>
-function change() {
- document.getElementById("im").type="text";
-}
-</script>
-</head>
-<body _onload_="change()">
-Test the changing of an input type=IMAGE to type=TEXT. This test is to make sure that
-the height and width attributes are ignored for the new type of TEXT.
-<form>
-<br>input element <input id="im" type="image" src="" height="17" width="19">
-</form>
-</body>
-</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/fast/forms/input-type-change-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-linux/fast/forms/input-type-change2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac/fast/forms/input-type-change-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac-leopard/fast/forms/input-type-change-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/fast/forms/input-type-change-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/fast/forms/input-type-change-expected.txt (87266 => 87267)
--- trunk/LayoutTests/platform/chromium-win/fast/forms/input-type-change-expected.txt 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/chromium-win/fast/forms/input-type-change-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock (anonymous) at (0,0) size 784x40
- RenderText {#text} at (0,0) size 770x39
- text run at (0,0) width 770: "Test the changing of an input type=TEXT to type=IMAGE. This test is to make sure that the height and width attributes are used"
- text run at (0,20) width 172: "for the new type of IMAGE."
- RenderBlock {FORM} at (0,40) size 784x42
- RenderBR {BR} at (0,0) size 0x19
- RenderText {#text} at (0,22) size 83x19
- text run at (0,22) width 83: "input element "
- RenderImage {INPUT} at (83,20) size 19x17
- RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/chromium-win/fast/forms/input-type-change2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/fast/forms/input-type-change2-expected.txt (87266 => 87267)
--- trunk/LayoutTests/platform/chromium-win/fast/forms/input-type-change2-expected.txt 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/chromium-win/fast/forms/input-type-change2-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,17 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock (anonymous) at (0,0) size 784x40
- RenderText {#text} at (0,0) size 738x39
- text run at (0,0) width 738: "Test the changing of an input type=IMAGE to type=TEXT. This test is to make sure that the height and width attributes are"
- text run at (0,20) width 209: "ignored for the new type of TEXT."
- RenderBlock {FORM} at (0,40) size 784x46
- RenderBR {BR} at (0,0) size 0x19
- RenderText {#text} at (0,23) size 83x19
- text run at (0,23) width 83: "input element "
- RenderTextControl {INPUT} at (85,22) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (0,0) size 0x0
-layer at (95,73) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
Deleted: trunk/LayoutTests/platform/gtk/fast/forms/input-type-change-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/fast/forms/input-type-change-expected.txt (87266 => 87267)
--- trunk/LayoutTests/platform/gtk/fast/forms/input-type-change-expected.txt 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/gtk/fast/forms/input-type-change-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock (anonymous) at (0,0) size 784x38
- RenderText {#text} at (0,0) size 778x38
- text run at (0,0) width 778: "Test the changing of an input type=TEXT to type=IMAGE. This test is to make sure that the height and width attributes are"
- text run at (0,19) width 214: "used for the new type of IMAGE."
- RenderBlock {FORM} at (0,38) size 784x40
- RenderBR {BR} at (0,0) size 0x19
- RenderText {#text} at (0,21) size 89x19
- text run at (0,21) width 89: "input element "
- RenderImage {INPUT} at (89,19) size 19x17
- RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/gtk/fast/forms/input-type-change2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/fast/forms/input-type-change2-expected.txt (87266 => 87267)
--- trunk/LayoutTests/platform/gtk/fast/forms/input-type-change2-expected.txt 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/gtk/fast/forms/input-type-change2-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,17 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock (anonymous) at (0,0) size 784x38
- RenderText {#text} at (0,0) size 778x38
- text run at (0,0) width 778: "Test the changing of an input type=IMAGE to type=TEXT. This test is to make sure that the height and width attributes are"
- text run at (0,19) width 222: "ignored for the new type of TEXT."
- RenderBlock {FORM} at (0,38) size 784x48
- RenderBR {BR} at (0,0) size 0x19
- RenderText {#text} at (0,24) size 89x19
- text run at (0,24) width 89: "input element "
- RenderTextControl {INPUT} at (91,21) size 194x25 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (0,0) size 0x0
-layer at (102,70) size 188x19
- RenderBlock {DIV} at (3,3) size 188x19
Deleted: trunk/LayoutTests/platform/mac/fast/forms/input-type-change-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/fast/forms/input-type-change-expected.txt (87266 => 87267)
--- trunk/LayoutTests/platform/mac/fast/forms/input-type-change-expected.txt 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/mac/fast/forms/input-type-change-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock (anonymous) at (0,0) size 784x36
- RenderText {#text} at (0,0) size 778x36
- text run at (0,0) width 778: "Test the changing of an input type=TEXT to type=IMAGE. This test is to make sure that the height and width attributes are"
- text run at (0,18) width 214: "used for the new type of IMAGE."
- RenderBlock {FORM} at (0,36) size 784x39
- RenderBR {BR} at (0,0) size 0x18
- RenderText {#text} at (0,21) size 89x18
- text run at (0,21) width 89: "input element "
- RenderImage {INPUT} at (89,18) size 19x17
- RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/mac/fast/forms/input-type-change2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/fast/forms/input-type-change2-expected.txt (87266 => 87267)
--- trunk/LayoutTests/platform/mac/fast/forms/input-type-change2-expected.txt 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/mac/fast/forms/input-type-change2-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,17 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock (anonymous) at (0,0) size 784x36
- RenderText {#text} at (0,0) size 778x36
- text run at (0,0) width 778: "Test the changing of an input type=IMAGE to type=TEXT. This test is to make sure that the height and width attributes are"
- text run at (0,18) width 222: "ignored for the new type of TEXT."
- RenderBlock {FORM} at (0,36) size 784x41
- RenderBR {BR} at (0,0) size 0x18
- RenderText {#text} at (0,20) size 89x18
- text run at (0,20) width 89: "input element "
- RenderTextControl {INPUT} at (91,20) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (0,0) size 0x0
-layer at (102,67) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
Deleted: trunk/LayoutTests/platform/mac-leopard/fast/forms/input-type-change-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac-leopard/fast/forms/input-type-change2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/fast/forms/input-type-change-expected.txt (87266 => 87267)
--- trunk/LayoutTests/platform/qt/fast/forms/input-type-change-expected.txt 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/qt/fast/forms/input-type-change-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,15 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock (anonymous) at (0,0) size 784x44
- RenderText {#text} at (0,0) size 745x44
- text run at (0,0) width 745: "Test the changing of an input type=TEXT to type=IMAGE. This test is to make sure that the height and width"
- text run at (0,22) width 321: "attributes are used for the new type of IMAGE."
- RenderBlock {FORM} at (0,44) size 784x45
- RenderBR {BR} at (0,0) size 0x22
- RenderText {#text} at (0,23) size 96x22
- text run at (0,23) width 96: "input element "
- RenderImage {INPUT} at (96,22) size 19x17
- RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/qt/fast/forms/input-type-change2-expected.txt (87266 => 87267)
--- trunk/LayoutTests/platform/qt/fast/forms/input-type-change2-expected.txt 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/qt/fast/forms/input-type-change2-expected.txt 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1,17 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x576
- RenderBlock (anonymous) at (0,0) size 784x44
- RenderText {#text} at (0,0) size 745x44
- text run at (0,0) width 745: "Test the changing of an input type=IMAGE to type=TEXT. This test is to make sure that the height and width"
- text run at (0,22) width 331: "attributes are ignored for the new type of TEXT."
- RenderBlock {FORM} at (0,44) size 784x52
- RenderBR {BR} at (0,0) size 0x22
- RenderText {#text} at (0,26) size 96x22
- text run at (0,26) width 96: "input element "
- RenderTextControl {INPUT} at (98,24) size 166x26
- RenderText {#text} at (0,0) size 0x0
-layer at (108,78) size 162x22
- RenderBlock {DIV} at (2,2) size 162x22
Modified: trunk/LayoutTests/platform/qt-arm/Skipped (87266 => 87267)
--- trunk/LayoutTests/platform/qt-arm/Skipped 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/qt-arm/Skipped 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1860,7 +1860,6 @@
fast/forms/input-text-option-delete.html
fast/forms/input-text-self-emptying-click.html
fast/forms/input-text-word-wrap.html
-fast/forms/input-type-change2.html
fast/forms/input-type-change.html
fast/forms/input-width.html
fast/forms/isindex-placeholder.html
Modified: trunk/LayoutTests/platform/qt-mac/Skipped (87266 => 87267)
--- trunk/LayoutTests/platform/qt-mac/Skipped 2011-05-25 04:20:02 UTC (rev 87266)
+++ trunk/LayoutTests/platform/qt-mac/Skipped 2011-05-25 04:26:04 UTC (rev 87267)
@@ -1777,7 +1777,6 @@
fast/forms/input-text-option-delete.html
fast/forms/input-text-self-emptying-click.html
fast/forms/input-text-word-wrap.html
-fast/forms/input-type-change2.html
fast/forms/input-type-change.html
fast/forms/input-width.html
fast/forms/isindex-placeholder.html
