[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:54:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2d54ca72c3f714f818a5425bc7dd1fed5a3ce535
Author: morrita at google.com <morrita at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 01:21:33 2010 +0000
2010-10-22 MORITA Hajime <morrita at google.com>
Reviewed by Tony Chang.
Text test conversion: editing/spelling/spelling-linebreak.html
https://bugs.webkit.org/show_bug.cgi?id=47649
Rewrote verification part using hasSpellingMarker().
* editing/spelling/spelling-linebreak-expected.txt: Added.
* editing/spelling/spelling-linebreak.html:
* platform/gtk/editing/spelling/spelling-linebreak-expected.txt: Removed.
* platform/mac/editing/spelling/spelling-linebreak-expected.checksum: Removed.
* platform/mac/editing/spelling/spelling-linebreak-expected.png: Removed.
* platform/mac/editing/spelling/spelling-linebreak-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70429 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 762cc45..8c132a2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-22 MORITA Hajime <morrita at google.com>
+
+ Reviewed by Tony Chang.
+
+ Text test conversion: editing/spelling/spelling-linebreak.html
+ https://bugs.webkit.org/show_bug.cgi?id=47649
+
+ Rewrote verification part using hasSpellingMarker().
+
+ * editing/spelling/spelling-linebreak-expected.txt: Added.
+ * editing/spelling/spelling-linebreak.html:
+ * platform/gtk/editing/spelling/spelling-linebreak-expected.txt: Removed.
+ * platform/mac/editing/spelling/spelling-linebreak-expected.checksum: Removed.
+ * platform/mac/editing/spelling/spelling-linebreak-expected.png: Removed.
+ * platform/mac/editing/spelling/spelling-linebreak-expected.txt: Removed.
+
2010-10-24 Daniel Bates <dbates at rim.com>
Reviewed by Antonio Gomes.
diff --git a/LayoutTests/editing/spelling/spelling-linebreak-expected.txt b/LayoutTests/editing/spelling/spelling-linebreak-expected.txt
new file mode 100644
index 0000000..769b3c8
--- /dev/null
+++ b/LayoutTests/editing/spelling/spelling-linebreak-expected.txt
@@ -0,0 +1,3 @@
+You should see 'zz a' on the first line below, and 'a' on the second line. 'zz' (and only 'zz') should be marked as misspelled.
+PASS
+
diff --git a/LayoutTests/editing/spelling/spelling-linebreak.html b/LayoutTests/editing/spelling/spelling-linebreak.html
index 42c965e..f5818e6 100644
--- a/LayoutTests/editing/spelling/spelling-linebreak.html
+++ b/LayoutTests/editing/spelling/spelling-linebreak.html
@@ -11,8 +11,18 @@
<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
<script>
+function log(msg) {
+ document.getElementById("console").innerHTML += (msg + "\n");
+}
function editingTest() {
+
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ var elem = document.getElementById("test");
+ var selection = window.getSelection();
+ selection.setPosition(elem, 6);
+
typeCharacterCommand('z');
typeCharacterCommand('z');
typeCharacterCommand(' ');
@@ -21,6 +31,16 @@ function editingTest() {
typeCharacterCommand('a');
moveSelectionBackwardByWordCommand();
insertLineBreakCommand();
+
+ if (window.layoutTestController) {
+ selection.setPosition(elem, 0);
+ if (layoutTestController.hasSpellingMarker(6, 2))
+ log("PASS");
+ else
+ log("FAIL");
+ document.getElementById("root").style.display = "none";
+ }
+
}
</script>
@@ -30,11 +50,12 @@ function editingTest() {
<body>
<div>You should see 'zz a' on the first line below, and 'a' on the second line. 'zz' (and only 'zz') should be marked as misspelled.</div>
<div contenteditable id="root" class="editing">
-<span id="test"></span>
+<!-- wee need leading "Hello," to preserve the marker even after setPosition() -->
+<span id="test">Hello,</span>
</div>
-
+<pre id="console"></pre>
<script>
-runEditingTest();
+editingTest();
</script>
</body>
diff --git a/LayoutTests/platform/gtk/editing/spelling/spelling-linebreak-expected.txt b/LayoutTests/platform/gtk/editing/spelling/spelling-linebreak-expected.txt
deleted file mode 100644
index b58ae5f..0000000
--- a/LayoutTests/platform/gtk/editing/spelling/spelling-linebreak-expected.txt
+++ /dev/null
@@ -1,16 +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 {DIV} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 729x19
- text run at (0,0) width 729: "You should see 'zz a' on the first line below, and 'a' on the second line. 'zz' (and only 'zz') should be marked as misspelled."
- RenderBlock {DIV} at (0,19) size 784x84 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 43x28
- text run at (14,14) width 43: "zz a "
- RenderBR {BR} at (57,36) size 0x0
- RenderText {#text} at (14,42) size 11x28
- text run at (14,42) width 11: "a"
- RenderInline {SPAN} at (0,0) size 0x28
-caret: position 0 of child 2 {#text} of child 3 {DIV} of body
diff --git a/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.checksum b/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.checksum
deleted file mode 100644
index 9e74b3a..0000000
--- a/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-c72041f57ef050ac752a20886968775c
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.png b/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.png
deleted file mode 100644
index d233210..0000000
Binary files a/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.txt b/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.txt
deleted file mode 100644
index 8535bf6..0000000
--- a/LayoutTests/platform/mac/editing/spelling/spelling-linebreak-expected.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of #text > DIV > BODY > HTML > #document to 2 of #text > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 3 of #text > DIV > BODY > HTML > #document toDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > DIV > BODY > HTML > #document to 4 of #text > DIV > BODY > HTML > #document toDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > DIV > BODY > HTML > #document to 1 of #text > DIV > BODY > HTML > #document toDOMRange:range from 2 of DIV > BODY > HTML > #document to 2 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-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 {DIV} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 768x18
- text run at (0,0) width 768: "You should see 'zz a' on the first line below, and 'a' on the second line. 'zz' (and only 'zz') should be marked as misspelled."
- RenderBlock {DIV} at (0,18) size 784x84 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 45x28
- text run at (14,14) width 45: "zz a "
- RenderBR {BR} at (59,36) size 0x0
- RenderText {#text} at (14,42) size 11x28
- text run at (14,42) width 11: "a"
- RenderInline {SPAN} at (0,0) size 0x28
-caret: position 0 of child 2 {#text} of child 3 {DIV} of body
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list