Diff
Modified: trunk/LayoutTests/ChangeLog (90030 => 90031)
--- trunk/LayoutTests/ChangeLog 2011-06-29 18:58:23 UTC (rev 90030)
+++ trunk/LayoutTests/ChangeLog 2011-06-29 18:58:43 UTC (rev 90031)
@@ -1,3 +1,25 @@
+2011-06-29 Wyatt Carss <[email protected]>
+
+ Reviewed by Ryosuke Niwa.
+
+ convert editing/deleting/paragraph-in-preserveNewline.html to dumpAsText
+ https://bugs.webkit.org/show_bug.cgi?id=63362
+
+ Converted editing/deleting/paragraph-in-preserveNewline.html to dump-as-markup,
+ added doctype, added new baseline, and removed old baselines.
+
+ * editing/deleting/paragraph-in-preserveNewline.html:
+ * editing/deleting/paragraph-in-preserveNewline-expected.html: Added.
+ * platform/chromium-linux/editing/deleting/paragraph-in-preserveNewline-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/paragraph-in-preserveNewline-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/paragraph-in-preserveNewline-expected.txt: Removed.
+ * platform/gtk/editing/deleting/paragraph-in-preserveNewline-expected.png: Removed.
+ * platform/mac-leopard/editing/deleting/paragraph-in-preserveNewline-expected.png: Removed.
+ * platform/mac/editing/deleting/paragraph-in-preserveNewline-expected.png: Removed.
+ * platform/mac/editing/deleting/paragraph-in-preserveNewline-expected.txt: Removed.
+ * platform/qt/editing/deleting/paragraph-in-preserveNewline-expected.png: Removed.
+ * platform/qt/editing/deleting/paragraph-in-preserveNewline-expected.txt: Removed.
+
2011-06-29 Nate Chapin <[email protected]>
Unreviewed, more chromium test updates.
Copied: trunk/LayoutTests/editing/deleting/paragraph-in-preserveNewline-expected.txt (from rev 90029, trunk/LayoutTests/platform/gtk/editing/deleting/paragraph-in-preserveNewline-expected.txt) (0 => 90031)
--- trunk/LayoutTests/editing/deleting/paragraph-in-preserveNewline-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:43 UTC (rev 90031)
@@ -0,0 +1,16 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > 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: shouldDeleteDOMRange:range from 0 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+This tests for a bug where deleting a paragraph in preserveNewline text would introduce an extra line. You should see '\nbar' below.
+| <pre>
+| "<#selection-caret>
+bar"
Modified: trunk/LayoutTests/editing/deleting/paragraph-in-preserveNewline.html (90030 => 90031)
--- trunk/LayoutTests/editing/deleting/paragraph-in-preserveNewline.html 2011-06-29 18:58:23 UTC (rev 90030)
+++ trunk/LayoutTests/editing/deleting/paragraph-in-preserveNewline.html 2011-06-29 18:58:43 UTC (rev 90031)
@@ -1,18 +1,24 @@
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpEditingCallbacks();
-</script>
-<p>This tests for a bug where deleting a paragraph in preserveNewline text would introduce an extra line. You should see '\nbar' below.</p>
+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests for a bug where deleting a paragraph in preserveNewline text would introduce an extra line. You should see '\nbar' below.</p>
<div id="test" contenteditable="true"><pre>foo
bar</pre></div>
+<script src=""
<script>
var sel = window.getSelection();
var e = document.getElementById("test");
+if (window.layoutTestController)
+ layoutTestController.dumpEditingCallbacks();
sel.setPosition(e, 0);
sel.modify("extend", "forward", "character");
sel.modify("extend", "forward", "character");
sel.modify("extend", "forward", "character");
document.execCommand("Delete");
-</script>
\ No newline at end of file
+Markup.description(description.textContent);
+Markup.dump("test");
+</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/deleting/paragraph-in-preserveNewline-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/paragraph-in-preserveNewline-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/paragraph-in-preserveNewline-expected.txt (90030 => 90031)
--- trunk/LayoutTests/platform/chromium-win/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:23 UTC (rev 90030)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:43 UTC (rev 90031)
@@ -1,26 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > 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: shouldDeleteDOMRange:range from 0 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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 784x579
- RenderBlock {P} at (0,0) size 784x40
- RenderText {#text} at (0,0) size 746x39
- text run at (0,0) width 612: "This tests for a bug where deleting a paragraph in preserveNewline text would introduce an extra line. "
- text run at (612,0) width 134: "You should see '\\nbar'"
- text run at (0,20) width 41: "below."
- RenderBlock {DIV} at (0,56) size 784x32
- RenderBlock {PRE} at (0,0) size 784x32
- RenderText {#text} at (0,0) size 24x32
- text run at (0,0) width 0: " "
- text run at (0,16) width 24: "bar"
-caret: position 0 of child 0 {#text} of child 0 {PRE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/deleting/paragraph-in-preserveNewline-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/editing/deleting/paragraph-in-preserveNewline-expected.txt (90030 => 90031)
--- trunk/LayoutTests/platform/gtk/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:23 UTC (rev 90030)
+++ trunk/LayoutTests/platform/gtk/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:43 UTC (rev 90031)
@@ -1,26 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > 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: shouldDeleteDOMRange:range from 0 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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 784x579
- RenderBlock {P} at (0,0) size 784x38
- RenderText {#text} at (0,0) size 743x38
- text run at (0,0) width 645: "This tests for a bug where deleting a paragraph in preserveNewline text would introduce an extra line. "
- text run at (645,0) width 98: "You should see"
- text run at (0,19) width 85: "'\\nbar' below."
- RenderBlock {DIV} at (0,54) size 784x30
- RenderBlock {PRE} at (0,0) size 784x30
- RenderText {#text} at (0,0) size 24x30
- text run at (0,0) width 0: " "
- text run at (0,15) width 24: "bar"
-caret: position 0 of child 0 {#text} of child 0 {PRE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/paragraph-in-preserveNewline-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/paragraph-in-preserveNewline-expected.txt (90030 => 90031)
--- trunk/LayoutTests/platform/mac/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:23 UTC (rev 90030)
+++ trunk/LayoutTests/platform/mac/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:43 UTC (rev 90031)
@@ -1,26 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > 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: shouldDeleteDOMRange:range from 0 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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 784x579
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 743x36
- text run at (0,0) width 645: "This tests for a bug where deleting a paragraph in preserveNewline text would introduce an extra line. "
- text run at (645,0) width 98: "You should see"
- text run at (0,18) width 85: "'\\nbar' below."
- RenderBlock {DIV} at (0,52) size 784x30
- RenderBlock {PRE} at (0,0) size 784x30
- RenderText {#text} at (0,0) size 24x30
- text run at (0,0) width 0: " "
- text run at (0,15) width 24: "bar"
-caret: position 0 of child 0 {#text} of child 0 {PRE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/deleting/paragraph-in-preserveNewline-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/paragraph-in-preserveNewline-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/paragraph-in-preserveNewline-expected.txt (90030 => 90031)
--- trunk/LayoutTests/platform/qt/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:23 UTC (rev 90030)
+++ trunk/LayoutTests/platform/qt/editing/deleting/paragraph-in-preserveNewline-expected.txt 2011-06-29 18:58:43 UTC (rev 90031)
@@ -1,26 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > 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: shouldDeleteDOMRange:range from 0 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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 784x579
- RenderBlock {P} at (0,0) size 784x44
- RenderText {#text} at (0,0) size 773x44
- text run at (0,0) width 695: "This tests for a bug where deleting a paragraph in preserveNewline text would introduce an extra line. "
- text run at (695,0) width 78: "You should"
- text run at (0,22) width 117: "see '\\nbar' below."
- RenderBlock {DIV} at (0,60) size 784x34
- RenderBlock {PRE} at (0,0) size 784x34
- RenderText {#text} at (0,0) size 18x34
- text run at (0,0) width 0: " "
- text run at (0,17) width 18: "bar"
-caret: position 0 of child 0 {#text} of child 0 {PRE} of child 2 {DIV} of body
