Diff
Modified: trunk/LayoutTests/ChangeLog (96897 => 96898)
--- trunk/LayoutTests/ChangeLog 2011-10-07 03:14:22 UTC (rev 96897)
+++ trunk/LayoutTests/ChangeLog 2011-10-07 03:23:06 UTC (rev 96898)
@@ -1,5 +1,20 @@
2011-10-06 Ryosuke Niwa <rn...@webkit.org>
+ Windows rebaseline after r96870. Also skip editing/pasteboard/smart-paste-008.html because it's a real failure
+ (tracked by the bug 69587).
+
+ * platform/win/Skipped:
+ * platform/win/editing/deleting/delete-br-010-expected.txt:
+ * platform/win/editing/deleting/regional-indicators-expected.txt: Removed.
+ * platform/win/editing/inserting/insert-3907422-fix-expected.txt: Copied from LayoutTests/editing/inserting/insert-3907422-fix-expected.txt.
+ * platform/win/editing/pasteboard/paste-text-002-expected.txt: Copied from LayoutTests/editing/pasteboard/paste-text-002-expected.txt.
+ * platform/win/editing/pasteboard/paste-text-004-expected.txt: Copied from LayoutTests/platform/mac/editing/pasteboard/paste-text-004-expected.txt.
+ * platform/win/editing/pasteboard/paste-text-005-expected.txt: Copied from LayoutTests/platform/mac/editing/pasteboard/paste-text-005-expected.txt.
+ * platform/win/editing/pasteboard/paste-text-008-expected.txt: Copied from LayoutTests/platform/mac/editing/pasteboard/paste-text-008-expected.txt.
+ * platform/win/editing/spelling/spelling-backspace-between-lines-expected.txt:
+
+2011-10-06 Ryosuke Niwa <rn...@webkit.org>
+
Chromium Mac rebaselines after r96870.
* platform/chromium-cg-mac-snowleopard/editing: Added.
Modified: trunk/LayoutTests/platform/win/Skipped (96897 => 96898)
--- trunk/LayoutTests/platform/win/Skipped 2011-10-07 03:14:22 UTC (rev 96897)
+++ trunk/LayoutTests/platform/win/Skipped 2011-10-07 03:23:06 UTC (rev 96898)
@@ -1423,3 +1423,7 @@
# https://bugs.webkit.org/show_bug.cgi?id=66773
http/tests/loading/progress-finished-callback.html
+
+# REGRESSION(r96870): editing/pasteboard/smart-paste-008.html fails on non-Mac
+# https://bugs.webkit.org/show_bug.cgi?id=69587
+editing/pasteboard/smart-paste-008.html
Modified: trunk/LayoutTests/platform/win/editing/deleting/delete-br-010-expected.txt (96897 => 96898)
--- trunk/LayoutTests/platform/win/editing/deleting/delete-br-010-expected.txt 2011-10-07 03:14:22 UTC (rev 96897)
+++ trunk/LayoutTests/platform/win/editing/deleting/delete-br-010-expected.txt 2011-10-07 03:23:06 UTC (rev 96898)
@@ -1,28 +1,10 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 6 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 2 of BODY > HTML > #document to 0 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 3 of #text > DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) 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
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 784x56 [border: (2px solid #FF0000)]
- RenderText {#text} at (14,14) size 40x28
- text run at (14,14) width 40: "One"
- RenderText {#text} at (54,14) size 44x28
- text run at (54,14) width 44: "Two"
+ RenderText {#text} at (14,14) size 84x28
+ text run at (14,14) width 84: "OneTwo"
RenderBlock (anonymous) at (0,56) size 784x0
caret: position 3 of child 0 {#text} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/win/editing/deleting/regional-indicators-expected.txt (96897 => 96898)
--- trunk/LayoutTests/platform/win/editing/deleting/regional-indicators-expected.txt 2011-10-07 03:14:22 UTC (rev 96897)
+++ trunk/LayoutTests/platform/win/editing/deleting/regional-indicators-expected.txt 2011-10-07 03:23:06 UTC (rev 96898)
@@ -1,5 +0,0 @@
-This test checks how backspacing works with regional indicator characters.
-
-a�
-1. Delete a flag: FAIL
-2. Delete a lone regional indicator character: FAIL
Copied: trunk/LayoutTests/platform/win/editing/inserting/insert-3907422-fix-expected.txt (from rev 96896, trunk/LayoutTests/editing/inserting/insert-3907422-fix-expected.txt) (0 => 96898)
--- trunk/LayoutTests/platform/win/editing/inserting/insert-3907422-fix-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/editing/inserting/insert-3907422-fix-expected.txt 2011-10-07 03:23:06 UTC (rev 96898)
@@ -0,0 +1,53 @@
+Buggy code before fix would insert blockquote after body element in second paste
+| <html>
+| <head>
+| "
+
+"
+| <style>
+| "
+.editing {
+ word-wrap: break-word;
+ -khtml-nbsp-mode: space;
+ -khtml-line-break: after-white-space;
+}
+"
+| "
+
+"
+| <title>
+| "Editing Test"
+| "
+"
+| "
+"
+| <body>
+| class="editing"
+| contenteditable=""
+| id="test"
+| "
+"
+| <div>
+| "foo"
+| <blockquote>
+| "bar"
+| "bazfoo"
+| <blockquote>
+| "bar"
+| "baz<#selection-caret>"
+| "
+
+"
+| <script>
+| src=""
+| "
+"
+| <script>
+| "
+ document.execCommand("SelectAll");
+ document.execCommand("Cut");
+ document.execCommand("Paste");
+ document.execCommand("Paste");
+ Markup.description("Buggy code before fix would insert blockquote after body element in second paste");
+ Markup.dump();
+"
Copied: trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-002-expected.txt (from rev 96896, trunk/LayoutTests/editing/pasteboard/paste-text-002-expected.txt) (0 => 96898)
--- trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-002-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-002-expected.txt 2011-10-07 03:23:06 UTC (rev 96898)
@@ -0,0 +1,10 @@
+This tests copy and pastes "is a tide in the affairs of men,\nWhich taken" twice.
+
+There is a tide in the affairs of men,
+Which takenis a tide in the affairs of men,
+Which taken at the flood leads on to fortune.
+Omitted, all the voyage of their life,
+Is bound in shallows and in miseries.
+execCopyCommand: <div id="test" class="editing">There is a tide in the affairs of men,</div> <div class="editing">Which taken at the flood leads on to fortune.</div> <div class="editing">Omitted, all the voyage of their life,</div> <div class="editing">Is bound in shallows and in miseries.</div>
+execPasteCommand: <div id="test" class="editing">There is a tide in the affairs of men,</div><div class="editing">Which taken at the flood leads on to fortune.</div> <div class="editing">Omitted, all the voyage of their life,</div> <div class="editing">Is bound in shallows and in miseries.</div>
+execPasteCommand: <div id="test" class="editing">There is a tide in the affairs of men,</div><div class="editing">Which takenis a tide in the affairs of men,</div><div class="editing">Which taken at the flood leads on to fortune.</div> <div class="editing">Omitted, all the voyage of their life,</div> <div class="editing">Is bound in shallows and in miseries.</div>
Copied: trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-004-expected.txt (from rev 96896, trunk/LayoutTests/platform/mac/editing/pasteboard/paste-text-004-expected.txt) (0 => 96898)
--- trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-004-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-004-expected.txt 2011-10-07 03:23:06 UTC (rev 96898)
@@ -0,0 +1,18 @@
+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 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 348x28
+ text run at (14,14) width 348: "There is a tide in the affairs of men,"
+ RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 434x28
+ text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
+ RenderBlock {DIV} at (0,112) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 351x28
+ text run at (14,14) width 351: "Omitted, all the voyage of their life,"
+ RenderBlock {DIV} at (0,168) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 357x28
+ text run at (14,14) width 357: "Is bound in shallows and in miseries."
+caret: position 0 of child 0 {#text} of child 2 {DIV} of body
Copied: trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-005-expected.txt (from rev 96896, trunk/LayoutTests/platform/mac/editing/pasteboard/paste-text-005-expected.txt) (0 => 96898)
--- trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-005-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-005-expected.txt 2011-10-07 03:23:06 UTC (rev 96898)
@@ -0,0 +1,21 @@
+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 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 348x28
+ text run at (14,14) width 348: "There is a tide in the affairs of men,"
+ RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 285x28
+ text run at (14,14) width 285: "is a tide in the affairs of men,"
+ RenderBlock {DIV} at (0,112) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 434x28
+ text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
+ RenderBlock {DIV} at (0,168) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 351x28
+ text run at (14,14) width 351: "Omitted, all the voyage of their life,"
+ RenderBlock {DIV} at (0,224) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 357x28
+ text run at (14,14) width 357: "Is bound in shallows and in miseries."
+caret: position 0 of child 0 {#text} of child 3 {DIV} of body
Copied: trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-008-expected.txt (from rev 96896, trunk/LayoutTests/platform/mac/editing/pasteboard/paste-text-008-expected.txt) (0 => 96898)
--- trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-008-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/editing/pasteboard/paste-text-008-expected.txt 2011-10-07 03:23:06 UTC (rev 96898)
@@ -0,0 +1,22 @@
+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 784x140 [border: (2px solid #FF0000)]
+ RenderBlock (anonymous) at (14,14) size 756x28
+ RenderText {#text} at (0,0) size 351x28
+ text run at (0,0) width 351: "Omitted, all the voyage of their life,"
+ RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 357x28
+ text run at (14,14) width 357: "Is bound in shallows and in miseries."
+ RenderBlock (anonymous) at (14,98) size 756x28
+ RenderText {#text} at (0,0) size 440x28
+ text run at (0,0) width 440: "Upon such a full seashallows and in miseries."
+ RenderBlock (anonymous) at (0,140) size 784x0
+ RenderBlock {DIV} at (0,140) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {#text} at (14,14) size 197x28
+ text run at (14,14) width 197: "Upon such a full sea"
+ RenderText {#text} at (211,14) size 185x28
+ text run at (211,14) width 185: " are we now afloat,"
+caret: position 20 of child 0 {#text} of child 2 {DIV} of body
Modified: trunk/LayoutTests/platform/win/editing/spelling/spelling-backspace-between-lines-expected.txt (96897 => 96898)
--- trunk/LayoutTests/platform/win/editing/spelling/spelling-backspace-between-lines-expected.txt 2011-10-07 03:14:22 UTC (rev 96897)
+++ trunk/LayoutTests/platform/win/editing/spelling/spelling-backspace-between-lines-expected.txt 2011-10-07 03:23:06 UTC (rev 96898)
@@ -6,15 +6,15 @@
PASS firstLineText() is 'OK'
PASS sel.anchorNode.data is 'OK zz OK'
PASS layoutTestController.hasSpellingMarker(3, 2) is true
-PASS sel.anchorNode.data is 'OK zz OK'
+PASS sel.anchorNode.data is 'OKOK zz OK'
PASS firstLineText() is 'OKOK zz OK'
-FAIL layoutTestController.hasSpellingMarker(3, 2) should be true. Was false.
+FAIL layoutTestController.hasSpellingMarker(5, 2) should be true. Was false.
PASS firstLineText() is 'OK'
PASS sel.anchorNode.data is 'OK zz OK'
PASS layoutTestController.hasSpellingMarker(3, 2) is true
PASS firstLineText() is 'OKOK zz OK'
-PASS sel.anchorNode.data is 'OK zz OK'
-FAIL layoutTestController.hasSpellingMarker(3, 2) should be true. Was false.
+PASS sel.anchorNode.data is 'OKOK zz OK'
+FAIL layoutTestController.hasSpellingMarker(5, 2) should be true. Was false.
PASS successfullyParsed is true
TEST COMPLETE
