2011-05-26 Ryosuke Niwa <rniwa@webkit.org>
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 May 2011 05:33:49 +0000 (05:33 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 May 2011 05:33:49 +0000 (05:33 +0000)
        Reviewed by Eric Seidel.

        editing/pasteboard/4700297.html should be renamed and converted to a dump-as-markup test
        https://bugs.webkit.org/show_bug.cgi?id=61595

        Renamed 4700297.html to insert-div-text-into-text.html and converted it into a dump-as-markup test.

        * editing/pasteboard/4700297.html: Removed.
        * editing/pasteboard/insert-div-text-into-text-expected.txt: Added.
        * editing/pasteboard/insert-div-text-into-text.html: Copied from LayoutTests/editing/pasteboard/4700297.html.
        * platform/chromium-linux/editing/pasteboard/4700297-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/4700297-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/4700297-expected.txt: Removed.
        * platform/gtk/editing/pasteboard/4700297-expected.png: Removed.
        * platform/gtk/editing/pasteboard/4700297-expected.txt: Removed.
        * platform/mac-leopard/editing/pasteboard/4700297-expected.png: Removed.
        * platform/mac/editing/pasteboard/4700297-expected.png: Removed.
        * platform/mac/editing/pasteboard/4700297-expected.txt: Removed.
        * platform/qt/editing/pasteboard/4700297-expected.png: Removed.
        * platform/qt/editing/pasteboard/4700297-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@87472 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
LayoutTests/ChangeLog
LayoutTests/editing/pasteboard/insert-div-text-into-text-expected.txt [moved from LayoutTests/platform/gtk/editing/pasteboard/4700297-expected.txt with 63% similarity]
LayoutTests/editing/pasteboard/insert-div-text-into-text.html [moved from LayoutTests/editing/pasteboard/4700297.html with 60% similarity]
LayoutTests/platform/chromium-linux/editing/pasteboard/4700297-expected.png [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/4700297-expected.png [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/4700297-expected.txt [deleted file]
LayoutTests/platform/gtk/editing/pasteboard/4700297-expected.png [deleted file]
LayoutTests/platform/mac-leopard/editing/pasteboard/4700297-expected.png [deleted file]
LayoutTests/platform/mac/editing/pasteboard/4700297-expected.png [deleted file]
LayoutTests/platform/mac/editing/pasteboard/4700297-expected.txt [deleted file]
LayoutTests/platform/qt/editing/pasteboard/4700297-expected.png [deleted file]
LayoutTests/platform/qt/editing/pasteboard/4700297-expected.txt [deleted file]

index 77099be..7c54f54 100644 (file)
@@ -1,5 +1,28 @@
 2011-05-26  Ryosuke Niwa  <rniwa@webkit.org>
 
+        Reviewed by Eric Seidel.
+
+        editing/pasteboard/4700297.html should be renamed and converted to a dump-as-markup test
+        https://bugs.webkit.org/show_bug.cgi?id=61595
+
+        Renamed 4700297.html to insert-div-text-into-text.html and converted it into a dump-as-markup test.
+
+        * editing/pasteboard/4700297.html: Removed.
+        * editing/pasteboard/insert-div-text-into-text-expected.txt: Added.
+        * editing/pasteboard/insert-div-text-into-text.html: Copied from LayoutTests/editing/pasteboard/4700297.html.
+        * platform/chromium-linux/editing/pasteboard/4700297-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/4700297-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/4700297-expected.txt: Removed.
+        * platform/gtk/editing/pasteboard/4700297-expected.png: Removed.
+        * platform/gtk/editing/pasteboard/4700297-expected.txt: Removed.
+        * platform/mac-leopard/editing/pasteboard/4700297-expected.png: Removed.
+        * platform/mac/editing/pasteboard/4700297-expected.png: Removed.
+        * platform/mac/editing/pasteboard/4700297-expected.txt: Removed.
+        * platform/qt/editing/pasteboard/4700297-expected.png: Removed.
+        * platform/qt/editing/pasteboard/4700297-expected.txt: Removed.
+
+2011-05-26  Ryosuke Niwa  <rniwa@webkit.org>
+
         Reviewed by Hajime Morita.
 
         editing/pasteboard/5483567.html should be renamed and converted to a dump-as-markup test.
@@ -9,16 +9,9 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
 EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) 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
-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 41x19
-          text run at (0,0) width 41: "There "
-        RenderText {#text} at (41,0) size 42x19
-          text run at (41,0) width 42: "should"
-        RenderText {#text} at (83,0) size 215x19
-          text run at (83,0) width 215: " be no line breaks in this sentence."
-caret: position 6 of child 1 {#text} of child 0 {DIV} of body
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+This tests inserting a text wrapped in a div inside a text node.
+| "There "
+| "should<#selection-caret>"
+| " be no line breaks in this sentence."
@@ -1,10 +1,15 @@
+<!DOCTYPE>
+<html>
+<body>
+<div id="test" contenteditable="true">There&nbsp; be no line breaks in this sentence.</div>
+<script src="../../resources/dump-as-markup.js"></script>
 <script>
+
 if (window.layoutTestController)
-     layoutTestController.dumpEditingCallbacks();
-</script>
-<div id="test" contenteditable="true">There&nbsp; be no line breaks in this sentence.</div>
+    layoutTestController.dumpEditingCallbacks();
+
+Markup.description('This tests inserting a text wrapped in a div inside a text node.');
 
-<script>
 var sel = window.getSelection();
 var e = document.getElementById("test").firstChild;
 
@@ -12,4 +17,8 @@ sel.setPosition(e, 0);
 sel.modify("move", "forward", "word");
 sel.modify("move", "forward", "character");
 document.execCommand("InsertHTML", false, "<div>should</div>");
-</script>
\ No newline at end of file
+
+Markup.dump('test');
+</script>
+</body>
+</html>
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/4700297-expected.png b/LayoutTests/platform/chromium-linux/editing/pasteboard/4700297-expected.png
deleted file mode 100644 (file)
index 38e917b..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/pasteboard/4700297-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/4700297-expected.png b/LayoutTests/platform/chromium-win/editing/pasteboard/4700297-expected.png
deleted file mode 100644 (file)
index 6d78cff..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/pasteboard/4700297-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/4700297-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/4700297-expected.txt
deleted file mode 100644 (file)
index 907cee2..0000000
+++ /dev/null
@@ -1,24 +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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) 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
-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 784x20
-        RenderText {#text} at (0,0) size 39x19
-          text run at (0,0) width 39: "There "
-        RenderText {#text} at (39,0) size 39x19
-          text run at (39,0) width 39: "should"
-        RenderText {#text} at (78,0) size 205x19
-          text run at (78,0) width 205: " be no line breaks in this sentence."
-caret: position 6 of child 1 {#text} of child 0 {DIV} of body
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/4700297-expected.png b/LayoutTests/platform/gtk/editing/pasteboard/4700297-expected.png
deleted file mode 100644 (file)
index a25e918..0000000
Binary files a/LayoutTests/platform/gtk/editing/pasteboard/4700297-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac-leopard/editing/pasteboard/4700297-expected.png b/LayoutTests/platform/mac-leopard/editing/pasteboard/4700297-expected.png
deleted file mode 100644 (file)
index 0e0ac79..0000000
Binary files a/LayoutTests/platform/mac-leopard/editing/pasteboard/4700297-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/pasteboard/4700297-expected.png b/LayoutTests/platform/mac/editing/pasteboard/4700297-expected.png
deleted file mode 100644 (file)
index 7472cba..0000000
Binary files a/LayoutTests/platform/mac/editing/pasteboard/4700297-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/pasteboard/4700297-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/4700297-expected.txt
deleted file mode 100644 (file)
index 45c6665..0000000
+++ /dev/null
@@ -1,24 +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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) 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
-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 41x18
-          text run at (0,0) width 41: "There "
-        RenderText {#text} at (41,0) size 42x18
-          text run at (41,0) width 42: "should"
-        RenderText {#text} at (83,0) size 215x18
-          text run at (83,0) width 215: " be no line breaks in this sentence."
-caret: position 6 of child 1 {#text} of child 0 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/pasteboard/4700297-expected.png b/LayoutTests/platform/qt/editing/pasteboard/4700297-expected.png
deleted file mode 100644 (file)
index cc1bad0..0000000
Binary files a/LayoutTests/platform/qt/editing/pasteboard/4700297-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/qt/editing/pasteboard/4700297-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/4700297-expected.txt
deleted file mode 100644 (file)
index 69037ae..0000000
+++ /dev/null
@@ -1,24 +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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) 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
-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 784x22
-        RenderText {#text} at (0,0) size 45x22
-          text run at (0,0) width 45: "There "
-        RenderText {#text} at (45,0) size 45x22
-          text run at (45,0) width 45: "should"
-        RenderText {#text} at (90,0) size 229x22
-          text run at (90,0) width 229: " be no line breaks in this sentence."
-caret: position 6 of child 1 {#text} of child 0 {DIV} of body