[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
morrita at google.com
morrita at google.com
Wed Dec 22 14:51:21 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 914c38661e6dda8d6a294193774c848c5b7af5e4
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 22 08:21:17 2010 +0000
2010-10-22 MORITA Hajime <morrita at google.com>
Reviewed by Kent Tamura.
https://bugs.webkit.org/show_bug.cgi?id=47645
Conversion to text test: editing/spelling/spellcheck-attribute.html
Replaced a pixel test with test-based test using
LayoutTestController.hasSpellingMarker().
* editing/spelling/spellcheck-attribute-expected.txt: Added.
* editing/spelling/spellcheck-attribute.html:
* platform/chromium-win/editing/spelling/spellcheck-attribute-expected.checksum: Removed.
* platform/chromium-win/editing/spelling/spellcheck-attribute-expected.png: Removed.
* platform/chromium-win/editing/spelling/spellcheck-attribute-expected.txt: Removed.
* platform/chromium/test_expectations.txt:
* platform/gtk/editing/spelling/spellcheck-attribute-expected.txt: Removed.
* platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.checksum: Removed.
* platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.png: Removed.
* platform/mac/editing/spelling/spellcheck-attribute-expected.checksum: Removed.
* platform/mac/editing/spelling/spellcheck-attribute-expected.png: Removed.
* platform/mac/editing/spelling/spellcheck-attribute-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70295 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a6d2431..cd43dbd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2010-10-22 MORITA Hajime <morrita at google.com>
+
+ Reviewed by Kent Tamura.
+
+ https://bugs.webkit.org/show_bug.cgi?id=47645
+ Conversion to text test: editing/spelling/spellcheck-attribute.html
+
+ Replaced a pixel test with test-based test using
+ LayoutTestController.hasSpellingMarker().
+
+ * editing/spelling/spellcheck-attribute-expected.txt: Added.
+ * editing/spelling/spellcheck-attribute.html:
+ * platform/chromium-win/editing/spelling/spellcheck-attribute-expected.checksum: Removed.
+ * platform/chromium-win/editing/spelling/spellcheck-attribute-expected.png: Removed.
+ * platform/chromium-win/editing/spelling/spellcheck-attribute-expected.txt: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/gtk/editing/spelling/spellcheck-attribute-expected.txt: Removed.
+ * platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.checksum: Removed.
+ * platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.png: Removed.
+ * platform/mac/editing/spelling/spellcheck-attribute-expected.checksum: Removed.
+ * platform/mac/editing/spelling/spellcheck-attribute-expected.png: Removed.
+ * platform/mac/editing/spelling/spellcheck-attribute-expected.txt: Removed.
+
2010-10-21 James Simonsen <simonjam at chromium.org>
Reviewed by Adam Barth.
diff --git a/LayoutTests/editing/spelling/spellcheck-attribute-expected.txt b/LayoutTests/editing/spelling/spellcheck-attribute-expected.txt
new file mode 100644
index 0000000..e90ec60
--- /dev/null
+++ b/LayoutTests/editing/spelling/spellcheck-attribute-expected.txt
@@ -0,0 +1,9 @@
+This tests if the "spellcheck" attribute is implemented as written in its specification. If this test succeeds, you can see six forms filled with an invalid word 'zz '. Nevertheless, the 'zz ' only in the line 1.1, 1.2, and 2.2 are marked as misspelled.
+
+PASS:test1_1
+PASS:test1_2
+PASS:test1_3
+PASS:test2_1
+PASS:test2_2
+PASS:test2_3
+
diff --git a/LayoutTests/editing/spelling/spellcheck-attribute.html b/LayoutTests/editing/spelling/spellcheck-attribute.html
index 5743c37..70348c6 100644
--- a/LayoutTests/editing/spelling/spellcheck-attribute.html
+++ b/LayoutTests/editing/spelling/spellcheck-attribute.html
@@ -5,6 +5,7 @@
</head>
<body>
<p>This tests if the "spellcheck" attribute is implemented as written in its specification. If this test succeeds, you can see six forms filled with an invalid word 'zz '. Nevertheless, the 'zz ' only in the line 1.1, 1.2, and 2.2 are marked as misspelled.</p>
+<div id="testRoot">
<div spellcheck="true">
<label>1.1.</label><input id="test1_1" type="text"></input><br/>
<label>1.2.</label><input id="test1_2" type="text" spellcheck="true"></input><br/>
@@ -15,20 +16,36 @@
<label>2.2.</label><input id="test2_2" type="text" spellcheck="true"></input><br/>
<label>2.3.</label><input id="test2_3" type="text" spellcheck="false"></input><br/>
</div>
+</div>
+<pre id="console"></pre>
<script>
-function typeInvalidWord(id) {
+function log(msg) {
+ document.getElementById("console").innerHTML += (msg + "\n");
+}
+
+function testTypingInvalidWord(id, shouldBeMarked) {
document.getElementById(id).focus();
document.execCommand("InsertText", false, 'z');
document.execCommand("InsertText", false, 'z');
document.execCommand("InsertText", false, ' ');
+ if (shouldBeMarked == layoutTestController.hasSpellingMarker(0, 2))
+ log("PASS:" + id);
+ else
+ log("FAIL:" + id);
}
-typeInvalidWord('test1_1');
-typeInvalidWord('test1_2');
-typeInvalidWord('test1_3');
-typeInvalidWord('test2_1');
-typeInvalidWord('test2_2');
-typeInvalidWord('test2_3');
+testTypingInvalidWord('test1_1', true);
+testTypingInvalidWord('test1_2', true);
+testTypingInvalidWord('test1_3', false);
+testTypingInvalidWord('test2_1', false);
+testTypingInvalidWord('test2_2', true);
+testTypingInvalidWord('test2_3', false);
+
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ // Cleaning up for expeation text if running on DRT.
+ document.getElementById("testRoot").style.display = "none";
+}
</script>
</body>
</html>
diff --git a/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.checksum b/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.checksum
deleted file mode 100644
index 23b05ab..0000000
--- a/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-517949b7ba2cf84d6784fa6daabb3042
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.png b/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.png
deleted file mode 100644
index 30b73dd..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.txt b/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.txt
deleted file mode 100644
index 2efa032..0000000
--- a/LayoutTests/platform/chromium-win/editing/spelling/spellcheck-attribute-expected.txt
+++ /dev/null
@@ -1,66 +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 784x584
- RenderBlock {P} at (0,0) size 784x40
- RenderText {#text} at (0,0) size 777x39
- text run at (0,0) width 777: "This tests if the \"spellcheck\" attribute is implemented as written in its specification. If this test succeeds, you can see six forms filled"
- text run at (0,20) width 640: "with an invalid word 'zz '. Nevertheless, the 'zz ' only in the line 1.1, 1.2, and 2.2 are marked as misspelled."
- RenderBlock {DIV} at (0,56) size 784x78
- RenderInline {LABEL} at (0,0) size 24x19
- RenderText {#text} at (0,3) size 24x19
- text run at (0,3) width 24: "1.1."
- RenderTextControl {INPUT} at (26,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (183,18) size 0x0
- RenderInline {LABEL} at (0,0) size 24x19
- RenderText {#text} at (0,29) size 24x19
- text run at (0,29) width 24: "1.2."
- RenderTextControl {INPUT} at (26,28) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (183,44) size 0x0
- RenderInline {LABEL} at (0,0) size 24x19
- RenderText {#text} at (0,55) size 24x19
- text run at (0,55) width 24: "1.3."
- RenderTextControl {INPUT} at (26,54) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (183,70) size 0x0
- RenderBlock {DIV} at (0,134) size 784x78
- RenderInline {LABEL} at (0,0) size 24x19
- RenderText {#text} at (0,3) size 24x19
- text run at (0,3) width 24: "2.1."
- RenderTextControl {INPUT} at (26,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (183,18) size 0x0
- RenderInline {LABEL} at (0,0) size 24x19
- RenderText {#text} at (0,29) size 24x19
- text run at (0,29) width 24: "2.2."
- RenderTextControl {INPUT} at (26,28) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (183,44) size 0x0
- RenderInline {LABEL} at (0,0) size 24x19
- RenderText {#text} at (0,55) size 24x19
- text run at (0,55) width 24: "2.3."
- RenderTextControl {INPUT} at (26,54) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (183,70) size 0x0
-layer at (36,69) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 18x16
- text run at (1,0) width 18: "zz "
-layer at (36,95) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 18x16
- text run at (1,0) width 18: "zz "
-layer at (36,121) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 18x16
- text run at (1,0) width 18: "zz "
-layer at (36,147) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 18x16
- text run at (1,0) width 18: "zz "
-layer at (36,173) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 18x16
- text run at (1,0) width 18: "zz "
-layer at (36,199) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 18x16
- text run at (1,0) width 18: "zz "
-caret: position 3 of child 0 {#text} of child 0 {DIV} of child 10 {INPUT} of child 5 {DIV} of body
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 1862392..36ff025 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -1876,7 +1876,7 @@ BUG11251 WIN LINUX : fast/forms/textarea-metrics.html = FAIL
// We don't draw the spelling markers at all in test shell.
BUG11577 WIN LINUX : editing/spelling/inline_spelling_markers.html = FAIL
-BUG11577 LINUX : editing/spelling/spellcheck-attribute.html = FAIL
+BUG11577 WIN LINUX : editing/spelling/spellcheck-attribute.html = FAIL
BUG11577 WIN LINUX : editing/spelling/spelling-linebreak.html = FAIL
// Regresssions from WebKit Merge 43114:43242 that just need to be re-baselined.
diff --git a/LayoutTests/platform/gtk/editing/spelling/spellcheck-attribute-expected.txt b/LayoutTests/platform/gtk/editing/spelling/spellcheck-attribute-expected.txt
deleted file mode 100644
index fe8e18a..0000000
--- a/LayoutTests/platform/gtk/editing/spelling/spellcheck-attribute-expected.txt
+++ /dev/null
@@ -1,66 +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 784x584
- RenderBlock {P} at (0,0) size 784x40
- RenderText {#text} at (0,0) size 749x40
- text run at (0,0) width 748: "This tests if the \"spellcheck\" attribute is implemented as written in its specification. If this test succeeds, you can see six"
- text run at (0,20) width 749: "forms filled with an invalid word 'zz '. Nevertheless, the 'zz ' only in the line 1.1, 1.2, and 2.2 are marked as misspelled."
- RenderBlock {DIV} at (0,56) size 784x90
- RenderInline {LABEL} at (0,0) size 24x20
- RenderText {#text} at (0,5) size 24x20
- text run at (0,5) width 24: "1.1."
- RenderTextControl {INPUT} at (26,2) size 168x26 [bgcolor=#FFFFFF]
- RenderBR {BR} at (196,20) size 0x0
- RenderInline {LABEL} at (0,0) size 24x20
- RenderText {#text} at (0,35) size 24x20
- text run at (0,35) width 24: "1.2."
- RenderTextControl {INPUT} at (26,32) size 168x26 [bgcolor=#FFFFFF]
- RenderBR {BR} at (196,50) size 0x0
- RenderInline {LABEL} at (0,0) size 24x20
- RenderText {#text} at (0,65) size 24x20
- text run at (0,65) width 24: "1.3."
- RenderTextControl {INPUT} at (26,62) size 168x26 [bgcolor=#FFFFFF]
- RenderBR {BR} at (196,80) size 0x0
- RenderBlock {DIV} at (0,146) size 784x90
- RenderInline {LABEL} at (0,0) size 24x20
- RenderText {#text} at (0,5) size 24x20
- text run at (0,5) width 24: "2.1."
- RenderTextControl {INPUT} at (26,2) size 168x26 [bgcolor=#FFFFFF]
- RenderBR {BR} at (196,20) size 0x0
- RenderInline {LABEL} at (0,0) size 24x20
- RenderText {#text} at (0,35) size 24x20
- text run at (0,35) width 24: "2.2."
- RenderTextControl {INPUT} at (26,32) size 168x26 [bgcolor=#FFFFFF]
- RenderBR {BR} at (196,50) size 0x0
- RenderInline {LABEL} at (0,0) size 24x20
- RenderText {#text} at (0,65) size 24x20
- text run at (0,65) width 24: "2.3."
- RenderTextControl {INPUT} at (26,62) size 168x26 [bgcolor=#FFFFFF]
- RenderBR {BR} at (196,80) size 0x0
-layer at (37,69) size 162x20
- RenderBlock {DIV} at (3,3) size 162x20
- RenderText {#text} at (1,0) size 18x20
- text run at (1,0) width 18: "zz "
-layer at (37,99) size 162x20
- RenderBlock {DIV} at (3,3) size 162x20
- RenderText {#text} at (1,0) size 18x20
- text run at (1,0) width 18: "zz "
-layer at (37,129) size 162x20
- RenderBlock {DIV} at (3,3) size 162x20
- RenderText {#text} at (1,0) size 18x20
- text run at (1,0) width 18: "zz "
-layer at (37,159) size 162x20
- RenderBlock {DIV} at (3,3) size 162x20
- RenderText {#text} at (1,0) size 18x20
- text run at (1,0) width 18: "zz "
-layer at (37,189) size 162x20
- RenderBlock {DIV} at (3,3) size 162x20
- RenderText {#text} at (1,0) size 18x20
- text run at (1,0) width 18: "zz "
-layer at (37,219) size 162x20
- RenderBlock {DIV} at (3,3) size 162x20
- RenderText {#text} at (1,0) size 18x20
- text run at (1,0) width 18: "zz "
-caret: position 3 of child 0 {#text} of child 0 {DIV} of child 10 {INPUT} of child 5 {DIV} of body
diff --git a/LayoutTests/platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.checksum b/LayoutTests/platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.checksum
deleted file mode 100644
index 272e7ea..0000000
--- a/LayoutTests/platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-e6552511d2470312a0c174ed32f13494
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.png b/LayoutTests/platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.png
deleted file mode 100644
index 126425d..0000000
Binary files a/LayoutTests/platform/mac-leopard/editing/spelling/spellcheck-attribute-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.checksum b/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.checksum
deleted file mode 100644
index da88c3a..0000000
--- a/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-63f9dcca21704e4f75ff60af9a381e6a
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.png b/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.png
deleted file mode 100644
index 6af05ac..0000000
Binary files a/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.txt b/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.txt
deleted file mode 100644
index eca86c7..0000000
--- a/LayoutTests/platform/mac/editing/spelling/spellcheck-attribute-expected.txt
+++ /dev/null
@@ -1,66 +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 784x584
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 749x36
- text run at (0,0) width 748: "This tests if the \"spellcheck\" attribute is implemented as written in its specification. If this test succeeds, you can see six"
- text run at (0,18) width 749: "forms filled with an invalid word 'zz '. Nevertheless, the 'zz ' only in the line 1.1, 1.2, and 2.2 are marked as misspelled."
- RenderBlock {DIV} at (0,52) size 784x69
- RenderInline {LABEL} at (0,0) size 24x18
- RenderText {#text} at (0,2) size 24x18
- text run at (0,2) width 24: "1.1."
- RenderTextControl {INPUT} at (26,2) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (153,16) size 0x0
- RenderInline {LABEL} at (0,0) size 24x18
- RenderText {#text} at (0,25) size 24x18
- text run at (0,25) width 24: "1.2."
- RenderTextControl {INPUT} at (26,25) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (153,39) size 0x0
- RenderInline {LABEL} at (0,0) size 24x18
- RenderText {#text} at (0,48) size 24x18
- text run at (0,48) width 24: "1.3."
- RenderTextControl {INPUT} at (26,48) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (153,62) size 0x0
- RenderBlock {DIV} at (0,121) size 784x69
- RenderInline {LABEL} at (0,0) size 24x18
- RenderText {#text} at (0,2) size 24x18
- text run at (0,2) width 24: "2.1."
- RenderTextControl {INPUT} at (26,2) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (153,16) size 0x0
- RenderInline {LABEL} at (0,0) size 24x18
- RenderText {#text} at (0,25) size 24x18
- text run at (0,25) width 24: "2.2."
- RenderTextControl {INPUT} at (26,25) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (153,39) size 0x0
- RenderInline {LABEL} at (0,0) size 24x18
- RenderText {#text} at (0,48) size 24x18
- text run at (0,48) width 24: "2.3."
- RenderTextControl {INPUT} at (26,48) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderBR {BR} at (153,62) size 0x0
-layer at (37,65) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
- RenderText {#text} at (1,0) size 16x13
- text run at (1,0) width 16: "zz "
-layer at (37,88) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
- RenderText {#text} at (1,0) size 16x13
- text run at (1,0) width 16: "zz "
-layer at (37,111) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
- RenderText {#text} at (1,0) size 16x13
- text run at (1,0) width 16: "zz "
-layer at (37,134) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
- RenderText {#text} at (1,0) size 16x13
- text run at (1,0) width 16: "zz "
-layer at (37,157) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
- RenderText {#text} at (1,0) size 16x13
- text run at (1,0) width 16: "zz "
-layer at (37,180) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
- RenderText {#text} at (1,0) size 16x13
- text run at (1,0) width 16: "zz "
-caret: position 3 of child 0 {#text} of child 0 {DIV} of child 10 {INPUT} of child 5 {DIV} of body
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list