2010-09-28 Ryosuke Niwa <rniwa@webkit.org>
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Sep 2010 17:33:18 +0000 (17:33 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Sep 2010 17:33:18 +0000 (17:33 +0000)
        Reviewed by Kent Tamura.

        dump-as-markup conversion: editing/pasteboard/paste-4039777-fix.html, paste-list-001.html, and paste-table-001.html
        https://bugs.webkit.org/show_bug.cgi?id=46545

        Converted the following tests to dump-as-markup tests:
        editing/pasteboard/paste-4039777-fix.html
        editing/pasteboard/paste-list-001.html
        editing/pasteboard/paste-table-001.html

        * editing/pasteboard/paste-4039777-fix-expected.txt: Added.
        * editing/pasteboard/paste-4039777-fix.html:
        * editing/pasteboard/paste-list-001-expected.txt: Added.
        * editing/pasteboard/paste-list-001.html:
        * editing/pasteboard/paste-table-001-expected.txt: Added.
        * editing/pasteboard/paste-table-001.html:
        * platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
        * platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
        * platform/chromium-linux/editing/pasteboard/paste-list-001-expected.checksum: Removed.
        * platform/chromium-linux/editing/pasteboard/paste-list-001-expected.png: Removed.
        * platform/chromium-linux/editing/pasteboard/paste-table-001-expected.checksum: Removed.
        * platform/chromium-linux/editing/pasteboard/paste-table-001-expected.png: Removed.
        * platform/chromium-mac/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
        * platform/chromium-mac/editing/pasteboard/paste-table-001-expected.checksum: Removed.
        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.checksum: Removed.
        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.txt: Removed.
        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.checksum: Removed.
        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.txt: Removed.
        * platform/gtk/editing/pasteboard/paste-table-001-expected.txt: Removed.
        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
        * platform/mac/editing/pasteboard/paste-list-001-expected.checksum: Removed.
        * platform/mac/editing/pasteboard/paste-list-001-expected.png: Removed.
        * platform/mac/editing/pasteboard/paste-list-001-expected.txt: Removed.
        * platform/mac/editing/pasteboard/paste-table-001-expected.checksum: Removed.
        * platform/mac/editing/pasteboard/paste-table-001-expected.png: Removed.
        * platform/mac/editing/pasteboard/paste-table-001-expected.txt: Removed.
        * platform/qt/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
        * platform/qt/editing/pasteboard/paste-list-001-expected.txt: Removed.
        * platform/qt/editing/pasteboard/paste-table-001-expected.txt: Removed.

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

36 files changed:
LayoutTests/ChangeLog
LayoutTests/editing/pasteboard/paste-4039777-fix-expected.txt [new file with mode: 0644]
LayoutTests/editing/pasteboard/paste-4039777-fix.html
LayoutTests/editing/pasteboard/paste-list-001-expected.txt [new file with mode: 0644]
LayoutTests/editing/pasteboard/paste-list-001.html
LayoutTests/editing/pasteboard/paste-table-001-expected.txt [moved from LayoutTests/platform/qt/editing/pasteboard/paste-table-001-expected.txt with 57% similarity]
LayoutTests/editing/pasteboard/paste-table-001.html
LayoutTests/platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.checksum [deleted file]
LayoutTests/platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.png [deleted file]
LayoutTests/platform/chromium-linux/editing/pasteboard/paste-list-001-expected.checksum [deleted file]
LayoutTests/platform/chromium-linux/editing/pasteboard/paste-list-001-expected.png [deleted file]
LayoutTests/platform/chromium-linux/editing/pasteboard/paste-table-001-expected.checksum [deleted file]
LayoutTests/platform/chromium-linux/editing/pasteboard/paste-table-001-expected.png [deleted file]
LayoutTests/platform/chromium-mac/editing/pasteboard/paste-4039777-fix-expected.checksum [deleted file]
LayoutTests/platform/chromium-mac/editing/pasteboard/paste-table-001-expected.checksum [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.checksum [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.png [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.txt [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.checksum [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.png [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.txt [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.checksum [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.png [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.txt [deleted file]
LayoutTests/platform/gtk/editing/pasteboard/paste-table-001-expected.txt [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.checksum [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.png [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.txt [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.checksum [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.png [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.txt [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.checksum [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.png [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.txt [deleted file]
LayoutTests/platform/qt/editing/pasteboard/paste-4039777-fix-expected.txt [deleted file]
LayoutTests/platform/qt/editing/pasteboard/paste-list-001-expected.txt [deleted file]

index ee29b2e..128251b 100644 (file)
@@ -1,3 +1,52 @@
+2010-09-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Kent Tamura.
+
+        dump-as-markup conversion: editing/pasteboard/paste-4039777-fix.html, paste-list-001.html, and paste-table-001.html
+        https://bugs.webkit.org/show_bug.cgi?id=46545
+
+        Converted the following tests to dump-as-markup tests:
+        editing/pasteboard/paste-4039777-fix.html
+        editing/pasteboard/paste-list-001.html
+        editing/pasteboard/paste-table-001.html
+
+        * editing/pasteboard/paste-4039777-fix-expected.txt: Added.
+        * editing/pasteboard/paste-4039777-fix.html:
+        * editing/pasteboard/paste-list-001-expected.txt: Added.
+        * editing/pasteboard/paste-list-001.html:
+        * editing/pasteboard/paste-table-001-expected.txt: Added.
+        * editing/pasteboard/paste-table-001.html:
+        * platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
+        * platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
+        * platform/chromium-linux/editing/pasteboard/paste-list-001-expected.checksum: Removed.
+        * platform/chromium-linux/editing/pasteboard/paste-list-001-expected.png: Removed.
+        * platform/chromium-linux/editing/pasteboard/paste-table-001-expected.checksum: Removed.
+        * platform/chromium-linux/editing/pasteboard/paste-table-001-expected.png: Removed.
+        * platform/chromium-mac/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
+        * platform/chromium-mac/editing/pasteboard/paste-table-001-expected.checksum: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.checksum: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.txt: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.checksum: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.txt: Removed.
+        * platform/gtk/editing/pasteboard/paste-table-001-expected.txt: Removed.
+        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
+        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
+        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
+        * platform/mac/editing/pasteboard/paste-list-001-expected.checksum: Removed.
+        * platform/mac/editing/pasteboard/paste-list-001-expected.png: Removed.
+        * platform/mac/editing/pasteboard/paste-list-001-expected.txt: Removed.
+        * platform/mac/editing/pasteboard/paste-table-001-expected.checksum: Removed.
+        * platform/mac/editing/pasteboard/paste-table-001-expected.png: Removed.
+        * platform/mac/editing/pasteboard/paste-table-001-expected.txt: Removed.
+        * platform/qt/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
+        * platform/qt/editing/pasteboard/paste-list-001-expected.txt: Removed.
+        * platform/qt/editing/pasteboard/paste-table-001-expected.txt: Removed.
+
 2010-09-28  Stephen White  <senorblanco@chromium.org>
 
         Unreviewed; expectations fix.
diff --git a/LayoutTests/editing/pasteboard/paste-4039777-fix-expected.txt b/LayoutTests/editing/pasteboard/paste-4039777-fix-expected.txt
new file mode 100644 (file)
index 0000000..9c0ee00
--- /dev/null
@@ -0,0 +1,75 @@
+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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of #text > LI > UL > DIV > DIV > BODY > HTML > #document to 14 of #text > LI > UL > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > LI > UL > DIV > LI > UL > DIV > DIV > BODY > HTML > #document to 1 of #text > LI > UL > DIV > LI > UL > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+Bug fix for <a href="rdar://problem/4039777">&lt;rdar://problem/4039777&gt;</a> Pasting particular snippet of HTML containing list items and a link creates too many list items
+
+Expected result:
+| "
+"
+| <ul>
+|   style="text-align:right;"
+|   <li>
+|     "A"
+| "
+"
+| <div>
+|   "
+    "
+|   <ul>
+|     "
+        "
+|     <li>
+|       "
+            "
+|       <a>
+|         href=""
+|         "B"
+|       "
+            "
+|       <br>
+|       "
+            C 
+        "
+|     "
+    "
+|   "
+"
+| "
+"
+
+Actual result:
+| "
+"
+| <ul>
+|   style="text-align:right;"
+|   <li>
+|     <ul>
+|       style="text-align: right; "
+|       <li>
+|         "A"
+|     <div>
+|       <ul>
+|         <li>
+|           <a>
+|             href=""
+|             "B"
+|           " "
+|           <br>
+|           "C<#selection-caret>"
+| <div>
+|   <ul>
+|     "
+    "
+|   "
+"
+| "
+"
index a3ff238..af7bdfc 100644 (file)
@@ -1,6 +1,5 @@
 <html> 
 <head>
-
 <style>
 .editing { 
     border: 2px solid red; 
 .expected-results:first-line { font-weight: bold }
 </style>
 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
-
-<script>
-
-function editingTest() {
-    for (i = 0; i < 3; i++)
-        extendSelectionForwardByLineCommand();
-    copyCommand();
-    pasteCommand();
-}
-
-</script>
-
+<script src="../../resources/dump-as-markup.js"></script>
 <title>Editing Test</title> 
 </head> 
 <body>
 
-<div class="explanation">
-<div class="scenario">
-Tests: 
-<br>
-Bug fix for <a href="rdar://problem/4039777">&lt;rdar://problem/4039777&gt;</a> Pasting particular snippet of HTML containing list items and a link creates too many list items
-</div>
-<div class="expected-results">
-Expected Results:
-<br>
-Should match:
-<BR>
+<div id="expected" class="expected-results">
 <ul style="text-align:right;"><li>A</li></ul>
 <div>
-       <ul>
-               <li>
-                       <a href="">B</a>
-                       <br>
-                       C 
-               </li>
-       </ul>
-</div>
+    <ul>
+        <li>
+            <a href="">B</a>
+            <br>
+            C 
+        </li>
+    </ul>
 </div>
 </div>
 
@@ -61,19 +38,30 @@ Should match:
 <div id="test" class="editing">
 <ul style="text-align:right;"><li>A</li></ul>
 <div>
-       <ul>
-               <li>
-                       <a href="">B</a>
-                       <br>
-                       
-               </li>
-       </ul>
+    <ul>
+        <li>
+            <a href="">B</a>
+            <br>
+            C 
+        </li>
+    </ul>
 </div>
 </div>
 </div>
-
 <script>
-runEditingTest();
+
+function editingTest() {
+    for (i = 0; i < 3; i++)
+        extendSelectionForwardByLineCommand();
+    copyCommand();
+    pasteCommand();
+    Markup.description('Bug fix for <a href="rdar://problem/4039777">&lt;rdar://problem/4039777&gt;</a> Pasting particular snippet of HTML containing list items and a link creates too many list items');
+    Markup.dump('expected', 'Expected result');
+    Markup.dump('test', 'Actual result');
+}
+
+runDumpAsTextEditingTest(true);
+
 </script>
 
 </body>
diff --git a/LayoutTests/editing/pasteboard/paste-list-001-expected.txt b/LayoutTests/editing/pasteboard/paste-list-001-expected.txt
new file mode 100644 (file)
index 0000000..18f478d
--- /dev/null
@@ -0,0 +1,46 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 6 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: shouldInsertNode:#document-fragment replacingDOMRange:range from 21 of #text > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 21 of #text > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > DIV > BODY > HTML > #document toDOMRange:range from 21 of #text > LI > OL > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > LI > OL > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+| "
+"
+| <span>
+|   id="test"
+|   "Empty list item"
+| "
+"
+| <p>
+|   "
+"
+| <ol>
+|   "
+    "
+|   <li>
+|     "I should be number 1."
+|   "
+    "
+|   <li>
+|   "
+    "
+|   <li>
+|     "I should be number 3."
+|     <ol>
+|       <li>
+|         "I should be number 1."
+|       <li>
+|       <li>
+|         "I should be number 3.<#selection-caret>"
+|   "
+"
+| "
+"
index e4167ea..004dbf2 100644 (file)
@@ -1,6 +1,5 @@
 <html> 
 <head>
-
 <style>
 .editing { 
     border: 2px solid red; 
@@ -9,20 +8,7 @@
 }
 </style>
 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
-
-<script>
-
-function editingTest() {
-       moveSelectionForwardByLineCommand()
-    for (i = 0; i < 3; i++)
-        extendSelectionForwardByLineCommand();
-    copyCommand();
-    moveSelectionForwardByLineCommand();
-    pasteCommand();
-}
-
-</script>
-
+<script src="../../resources/dump-as-markup.js"></script>
 <title>Editing Test</title> 
 </head> 
 <body>
@@ -35,10 +21,20 @@ function editingTest() {
     <li>I should be number 3.</li>
 </ol>
 </div>
-
 <script>
-runEditingTest();
-</script>
 
+function editingTest() {
+    moveSelectionForwardByLineCommand()
+    for (i = 0; i < 3; i++)
+        extendSelectionForwardByLineCommand();
+    copyCommand();
+    moveSelectionForwardByLineCommand();
+    pasteCommand();
+    Markup.dump('root');
+}
+
+runDumpAsTextEditingTest(true);
+
+</script>
 </body>
 </html>
@@ -42,46 +42,59 @@ EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range fr
 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of P > DIV > BODY > HTML > #document to 2 of P > DIV > BODY > HTML > #document toDOMRange:range from 32 of #text > TD > TR > TBODY > TABLE > P > DIV > BODY > HTML > #document to 32 of #text > TD > TR > TBODY > TABLE > P > 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 784x227 [border: (2px solid #FF0000)]
-        RenderBlock (anonymous) at (14,14) size 756x31
-          RenderInline {SPAN} at (0,0) size 168x32
-            RenderText {#text} at (0,0) size 168x32
-              text run at (0,0) width 168: "Empty table cell"
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {P} at (14,69) size 756x120
-          RenderTable {TABLE} at (0,0) size 312x60 [border: (2px outset #808080)]
-            RenderTableSection {TBODY} at (2,2) size 308x56
-              RenderTableRow {TR} at (0,2) size 308x25
-                RenderTableCell {TD} at (2,2) size 86x25 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 82x21
-                    text run at (2,2) width 82: "Left column"
-                RenderTableCell {TD} at (90,2) size 216x25 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 92x21
-                    text run at (2,2) width 92: "Right column"
-              RenderTableRow {TR} at (0,29) size 308x25
-                RenderTableCell {TD} at (2,39) size 86x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-                RenderTableCell {TD} at (90,29) size 216x25 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 212x21
-                    text run at (2,2) width 212: "I should be in the right column."
-          RenderTable {TABLE} at (0,60) size 312x60 [border: (2px outset #808080)]
-            RenderTableSection {TBODY} at (2,2) size 308x56
-              RenderTableRow {TR} at (0,2) size 308x25
-                RenderTableCell {TD} at (2,2) size 86x25 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 82x21
-                    text run at (2,2) width 82: "Left column"
-                RenderTableCell {TD} at (90,2) size 216x25 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 92x21
-                    text run at (2,2) width 92: "Right column"
-              RenderTableRow {TR} at (0,29) size 308x25
-                RenderTableCell {TD} at (2,39) size 86x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-                RenderTableCell {TD} at (90,29) size 216x25 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 212x21
-                    text run at (2,2) width 212: "I should be in the right column."
-          RenderBlock (anonymous) at (0,120) size 756x0
-            RenderText {#text} at (0,0) size 0x0
-caret: position 32 of child 0 {#text} of child 1 {TD} of child 1 {TR} of child 0 {TBODY} of child 2 {TABLE} of child 3 {P} of child 1 {DIV} of body
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+| "
+"
+| <span>
+|   id="test"
+|   "Empty table cell"
+| "
+"
+| <p>
+|   "
+"
+|   <table>
+|     border="2"
+|     "
+"
+|     <tbody>
+|       <tr>
+|         "
+    "
+|         <td>
+|           "Left column"
+|         "
+    "
+|         <td>
+|           "Right column"
+|         "
+"
+|       "
+"
+|       <tr>
+|         "
+    "
+|         <td>
+|         "
+    "
+|         <td>
+|           "I should be in the right column."
+|         "
+"
+|       "
+"
+|   <table>
+|     border="2"
+|     <tbody>
+|       <tr>
+|         <td>
+|           "Left column"
+|         <td>
+|           "Right column"
+|       <tr>
+|         <td>
+|         <td>
+|           "I should be in the right column.<#selection-caret>"
+|   "
+"
index 80fc4cb..ca85feb 100644 (file)
@@ -1,6 +1,5 @@
 <html> 
 <head>
-
 <style>
 .editing { 
     border: 2px solid red; 
@@ -9,22 +8,7 @@
 }
 </style>
 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
-
-<script>
-
-function editingTest() {
-    moveSelectionForwardByLineCommand();
-    for (i = 0; i < 3; i++)
-        extendSelectionForwardByLineCommand();
-    for (i = 0; i < 32; i++)
-        extendSelectionForwardByCharacterCommand();
-    copyCommand();
-    moveSelectionForwardByLineCommand();
-    pasteCommand();
-}
-
-</script>
-
+<script src="../../resources/dump-as-markup.js"></script>
 <title>Editing Test</title> 
 </head> 
 <body>
@@ -42,10 +26,22 @@ function editingTest() {
 </tr>
 </table>
 </div>
-
 <script>
-runEditingTest();
-</script>
 
+function editingTest() {
+    moveSelectionForwardByLineCommand();
+    for (i = 0; i < 3; i++)
+        extendSelectionForwardByLineCommand();
+    for (i = 0; i < 32; i++)
+        extendSelectionForwardByCharacterCommand();
+    copyCommand();
+    moveSelectionForwardByLineCommand();
+    pasteCommand();
+    Markup.dump('root');
+}
+
+runDumpAsTextEditingTest(true);
+
+</script>
 </body>
 </html>
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.checksum b/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.checksum
deleted file mode 100644 (file)
index 31b9304..0000000
+++ /dev/null
@@ -1 +0,0 @@
-33e3c27d5669ed988a828c523e8d7f61
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.png b/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.png
deleted file mode 100644 (file)
index 8a217f0..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-list-001-expected.checksum b/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-list-001-expected.checksum
deleted file mode 100644 (file)
index 899ca19..0000000
+++ /dev/null
@@ -1 +0,0 @@
-621cf3a218f64dbe4a7971393380e50f
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-list-001-expected.png b/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-list-001-expected.png
deleted file mode 100644 (file)
index 15222cb..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-list-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-table-001-expected.checksum b/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-table-001-expected.checksum
deleted file mode 100644 (file)
index 8ededf0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-c2d7ed9f3ad10eae3463bedbea2a58f6
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-table-001-expected.png b/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-table-001-expected.png
deleted file mode 100644 (file)
index 02e45f6..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-table-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-4039777-fix-expected.checksum b/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-4039777-fix-expected.checksum
deleted file mode 100644 (file)
index 0fcc9d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-c6d47eae4b76eb4bc353b05b7b4bc552
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-table-001-expected.checksum b/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-table-001-expected.checksum
deleted file mode 100644 (file)
index fe82d03..0000000
+++ /dev/null
@@ -1 +0,0 @@
-511806968f49f0a3676e2ad0f1236710
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.checksum b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.checksum
deleted file mode 100644 (file)
index 998e759..0000000
+++ /dev/null
@@ -1 +0,0 @@
-96e6e63b424270b3c976d93622f20dc4
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.png b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.png
deleted file mode 100644 (file)
index 8ca247c..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.txt
deleted file mode 100644 (file)
index 88f1158..0000000
+++ /dev/null
@@ -1,80 +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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of #text > LI > UL > DIV > DIV > BODY > HTML > #document to 5 of #text > LI > UL > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > LI > UL > DIV > LI > UL > DIV > DIV > BODY > HTML > #document to 1 of #text > LI > UL > DIV > LI > UL > DIV > 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 784x338 [border: (2px solid #0000FF)]
-        RenderBlock {DIV} at (14,14) size 756x83
-          RenderText {#text} at (0,0) size 66x26
-            text run at (0,0) width 66: "Tests: "
-          RenderBR {BR} at (0,0) size 0x0
-          RenderText {#text} at (0,27) size 111x27
-            text run at (0,27) width 111: "Bug fix for "
-          RenderInline {A} at (0,0) size 257x27 [color=#0000EE]
-            RenderText {#text} at (111,27) size 257x27
-              text run at (111,27) width 257: "<rdar://problem/4039777>"
-          RenderText {#text} at (368,27) size 716x55
-            text run at (368,27) width 348: " Pasting particular snippet of HTML"
-            text run at (0,55) width 552: "containing list items and a link creates too many list items"
-        RenderBlock {DIV} at (14,113) size 756x187
-          RenderBlock (anonymous) at (0,0) size 756x55
-            RenderText {#text} at (0,0) size 189x26
-              text run at (0,0) width 189: "Expected Results: "
-            RenderBR {BR} at (189,21) size 0x0
-            RenderText {#text} at (0,27) size 143x27
-              text run at (0,27) width 143: "Should match: "
-            RenderBR {BR} at (143,48) size 0x0
-          RenderBlock {UL} at (0,79) size 756x28
-            RenderListItem {LI} at (40,0) size 716x28
-              RenderListMarker at (-22,0) size 9x27: bullet
-              RenderText {#text} at (699,0) size 17x27
-                text run at (699,0) width 17: "A"
-          RenderBlock {DIV} at (0,131) size 756x56
-            RenderBlock {UL} at (0,0) size 756x56
-              RenderListItem {LI} at (40,0) size 716x56
-                RenderListMarker at (-22,0) size 9x27: bullet
-                RenderInline {A} at (0,0) size 16x27 [color=#0000EE]
-                  RenderText {#text} at (0,0) size 16x27
-                    text run at (0,0) width 16: "B"
-                RenderText {#text} at (16,0) size 6x27
-                  text run at (16,0) width 6: " "
-                RenderBR {BR} at (0,0) size 0x0
-                RenderText {#text} at (0,28) size 16x27
-                  text run at (0,28) width 16: "C"
-      RenderBlock {DIV} at (0,362) size 784x164
-        RenderBlock {DIV} at (0,0) size 784x164 [border: (2px solid #FF0000)]
-          RenderBlock {UL} at (2,26) size 780x112
-            RenderListItem {LI} at (40,0) size 740x112
-              RenderBlock (anonymous) at (0,0) size 740x28
-                RenderListMarker at (-22,0) size 9x27: bullet
-              RenderBlock {UL} at (0,28) size 740x28
-                RenderListItem {LI} at (40,0) size 700x28
-                  RenderListMarker at (-22,0) size 9x27: white bullet
-                  RenderText {#text} at (683,0) size 17x27
-                    text run at (683,0) width 17: "A"
-              RenderBlock {DIV} at (0,56) size 740x56
-                RenderBlock {UL} at (0,0) size 740x56
-                  RenderListItem {LI} at (40,0) size 700x56
-                    RenderListMarker at (-22,0) size 9x27: white bullet
-                    RenderInline {A} at (0,0) size 16x27 [color=#0000EE]
-                      RenderText {#text} at (678,0) size 16x27
-                        text run at (678,0) width 16: "B"
-                    RenderText {#text} at (694,0) size 6x27
-                      text run at (694,0) width 6: " "
-                    RenderBR {BR} at (700,21) size 0x0
-                    RenderText {#text} at (684,28) size 16x27
-                      text run at (684,28) width 16: "C"
-              RenderBlock (anonymous) at (0,112) size 740x0
-          RenderBlock {DIV} at (2,162) size 780x0
-            RenderBlock {UL} at (0,0) size 780x0
-caret: position 1 of child 3 {#text} of child 0 {LI} of child 0 {UL} of child 1 {DIV} of child 0 {LI} of child 1 {UL} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.checksum b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.checksum
deleted file mode 100644 (file)
index 23c7768..0000000
+++ /dev/null
@@ -1 +0,0 @@
-139375248d0c83b93d1b36a783000421
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.png b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.png
deleted file mode 100644 (file)
index 5dfa64d..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-list-001-expected.txt
deleted file mode 100644 (file)
index da1f6c8..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 6 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: shouldInsertNode:#document-fragment replacingDOMRange:range from 21 of #text > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 21 of #text > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > DIV > BODY > HTML > #document toDOMRange:range from 21 of #text > LI > OL > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > LI > OL > 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 784x272 [border: (2px solid #FF0000)]
-        RenderBlock (anonymous) at (14,14) size 756x28
-          RenderInline {SPAN} at (0,0) size 146x27
-            RenderText {#text} at (0,0) size 146x27
-              text run at (0,0) width 146: "Empty list item"
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {P} at (14,66) size 756x0
-        RenderBlock {OL} at (14,66) size 756x168
-          RenderListItem {LI} at (40,0) size 716x28
-            RenderListMarker at (-31,0) size 24x27: "1"
-            RenderText {#text} at (0,0) size 209x27
-              text run at (0,0) width 209: "I should be number 1."
-          RenderListItem {LI} at (40,28) size 716x28
-            RenderListMarker at (-31,0) size 24x27: "2"
-          RenderListItem {LI} at (40,56) size 716x112
-            RenderBlock (anonymous) at (0,0) size 716x28
-              RenderListMarker at (-31,0) size 24x27: "3"
-              RenderText {#text} at (0,0) size 209x27
-                text run at (0,0) width 209: "I should be number 3."
-            RenderBlock {OL} at (0,28) size 716x84
-              RenderListItem {LI} at (40,0) size 676x28
-                RenderListMarker at (-31,0) size 24x27: "1"
-                RenderText {#text} at (0,0) size 209x27
-                  text run at (0,0) width 209: "I should be number 1."
-              RenderListItem {LI} at (40,28) size 676x28
-                RenderListMarker at (-31,0) size 24x27: "2"
-              RenderListItem {LI} at (40,56) size 676x28
-                RenderListMarker at (-31,0) size 24x27: "3"
-                RenderText {#text} at (0,0) size 209x27
-                  text run at (0,0) width 209: "I should be number 3."
-            RenderBlock (anonymous) at (0,112) size 716x0
-caret: position 21 of child 0 {#text} of child 2 {LI} of child 1 {OL} of child 5 {LI} of child 4 {OL} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.checksum b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.checksum
deleted file mode 100644 (file)
index d8f842b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-d0b46b6fe8c6be875b0fe79bcbd299b0
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.png b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.png
deleted file mode 100644 (file)
index f5796a1..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-table-001-expected.txt
deleted file mode 100644 (file)
index c15ca8a..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 4 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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 2 of P > DIV > BODY > HTML > #document to 2 of P > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of P > DIV > BODY > HTML > #document to 2 of P > DIV > BODY > HTML > #document toDOMRange:range from 32 of #text > TD > TR > TBODY > TABLE > P > DIV > BODY > HTML > #document to 32 of #text > TD > TR > TBODY > TABLE > P > 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 784x220 [border: (2px solid #FF0000)]
-        RenderBlock (anonymous) at (14,14) size 756x28
-          RenderInline {SPAN} at (0,0) size 157x27
-            RenderText {#text} at (0,0) size 157x27
-              text run at (0,0) width 157: "Empty table cell"
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {P} at (14,66) size 756x116
-          RenderTable {TABLE} at (0,0) size 273x58 [border: (2px outset #808080)]
-            RenderTableSection {TBODY} at (2,2) size 269x54
-              RenderTableRow {TR} at (0,2) size 269x24
-                RenderTableCell {TD} at (2,2) size 75x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 71x19
-                    text run at (2,2) width 71: "Left column"
-                RenderTableCell {TD} at (79,2) size 188x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 78x19
-                    text run at (2,2) width 78: "Right column"
-              RenderTableRow {TR} at (0,28) size 269x24
-                RenderTableCell {TD} at (2,38) size 75x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-                RenderTableCell {TD} at (79,28) size 188x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 184x19
-                    text run at (2,2) width 184: "I should be in the right column."
-          RenderTable {TABLE} at (0,58) size 273x58 [border: (2px outset #808080)]
-            RenderTableSection {TBODY} at (2,2) size 269x54
-              RenderTableRow {TR} at (0,2) size 269x24
-                RenderTableCell {TD} at (2,2) size 75x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 71x19
-                    text run at (2,2) width 71: "Left column"
-                RenderTableCell {TD} at (79,2) size 188x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 78x19
-                    text run at (2,2) width 78: "Right column"
-              RenderTableRow {TR} at (0,28) size 269x24
-                RenderTableCell {TD} at (2,38) size 75x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-                RenderTableCell {TD} at (79,28) size 188x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 184x19
-                    text run at (2,2) width 184: "I should be in the right column."
-          RenderBlock (anonymous) at (0,116) size 756x0
-            RenderText {#text} at (0,0) size 0x0
-caret: position 32 of child 0 {#text} of child 1 {TD} of child 1 {TR} of child 0 {TBODY} of child 2 {TABLE} of child 3 {P} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-table-001-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-table-001-expected.txt
deleted file mode 100644 (file)
index 32760fd..0000000
+++ /dev/null
@@ -1,43 +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 784x216 [border: (2px solid #FF0000)]
-        RenderBlock (anonymous) at (14,14) size 756x28
-          RenderInline {SPAN} at (0,0) size 157x28
-            RenderText {#text} at (0,0) size 157x28
-              text run at (0,0) width 157: "Empty table cell"
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {P} at (14,66) size 756x112
-          RenderTable {TABLE} at (0,0) size 273x56 [border: (2px outset #808080)]
-            RenderTableSection {TBODY} at (2,2) size 269x52
-              RenderTableRow {TR} at (0,2) size 269x23
-                RenderTableCell {TD} at (2,2) size 75x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 71x19
-                    text run at (2,2) width 71: "Left column"
-                RenderTableCell {TD} at (79,2) size 188x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 78x19
-                    text run at (2,2) width 78: "Right column"
-              RenderTableRow {TR} at (0,27) size 269x23
-                RenderTableCell {TD} at (2,36) size 75x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-                RenderTableCell {TD} at (79,27) size 188x23 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 184x19
-                    text run at (2,2) width 184: "I should be in the right column."
-          RenderTable {TABLE} at (0,56) size 273x56 [border: (2px outset #808080)]
-            RenderTableSection {TBODY} at (2,2) size 269x52
-              RenderTableRow {TR} at (0,2) size 269x23
-                RenderTableCell {TD} at (2,2) size 75x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 71x19
-                    text run at (2,2) width 71: "Left column"
-                RenderTableCell {TD} at (79,2) size 188x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 78x19
-                    text run at (2,2) width 78: "Right column"
-              RenderTableRow {TR} at (0,27) size 269x23
-                RenderTableCell {TD} at (2,36) size 75x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-                RenderTableCell {TD} at (79,27) size 188x23 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 184x19
-                    text run at (2,2) width 184: "I should be in the right column."
-          RenderBlock (anonymous) at (0,112) size 756x0
-            RenderText {#text} at (0,0) size 0x0
-caret: position 32 of child 0 {#text} of child 1 {TD} of child 1 {TR} of child 0 {TBODY} of child 2 {TABLE} of child 3 {P} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.checksum b/LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.checksum
deleted file mode 100644 (file)
index e5aa826..0000000
+++ /dev/null
@@ -1 +0,0 @@
-ab0e7fbab87c23e31d2871a8e3d2d84b
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.png b/LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.png
deleted file mode 100644 (file)
index 84b9563..0000000
Binary files a/LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/paste-4039777-fix-expected.txt
deleted file mode 100644 (file)
index a5a45bf..0000000
+++ /dev/null
@@ -1,80 +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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of #text > LI > UL > DIV > DIV > BODY > HTML > #document to 5 of #text > LI > UL > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > LI > UL > DIV > LI > UL > DIV > DIV > BODY > HTML > #document to 1 of #text > LI > UL > DIV > LI > UL > DIV > 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 784x340 [border: (2px solid #0000FF)]
-        RenderBlock {DIV} at (14,14) size 756x84
-          RenderText {#text} at (0,0) size 67x28
-            text run at (0,0) width 67: "Tests: "
-          RenderBR {BR} at (0,0) size 0x0
-          RenderText {#text} at (0,28) size 113x28
-            text run at (0,28) width 113: "Bug fix for "
-          RenderInline {A} at (0,0) size 260x28 [color=#0000EE]
-            RenderText {#text} at (113,28) size 260x28
-              text run at (113,28) width 260: "<rdar://problem/4039777>"
-          RenderText {#text} at (373,28) size 726x56
-            text run at (373,28) width 353: " Pasting particular snippet of HTML"
-            text run at (0,56) width 566: "containing list items and a link creates too many list items"
-        RenderBlock {DIV} at (14,114) size 756x188
-          RenderBlock (anonymous) at (0,0) size 756x56
-            RenderText {#text} at (0,0) size 189x28
-              text run at (0,0) width 189: "Expected Results: "
-            RenderBR {BR} at (189,22) size 0x0
-            RenderText {#text} at (0,28) size 147x28
-              text run at (0,28) width 147: "Should match: "
-            RenderBR {BR} at (147,50) size 0x0
-          RenderBlock {UL} at (0,80) size 756x28
-            RenderListItem {LI} at (40,0) size 716x28
-              RenderListMarker at (-22,0) size 9x28: bullet
-              RenderText {#text} at (699,0) size 17x28
-                text run at (699,0) width 17: "A"
-          RenderBlock {DIV} at (0,132) size 756x56
-            RenderBlock {UL} at (0,0) size 756x56
-              RenderListItem {LI} at (40,0) size 716x56
-                RenderListMarker at (-22,0) size 9x28: bullet
-                RenderInline {A} at (0,0) size 16x28 [color=#0000EE]
-                  RenderText {#text} at (0,0) size 16x28
-                    text run at (0,0) width 16: "B"
-                RenderText {#text} at (16,0) size 6x28
-                  text run at (16,0) width 6: " "
-                RenderBR {BR} at (0,0) size 0x0
-                RenderText {#text} at (0,28) size 16x28
-                  text run at (0,28) width 16: "C"
-      RenderBlock {DIV} at (0,364) size 784x164
-        RenderBlock {DIV} at (0,0) size 784x164 [border: (2px solid #FF0000)]
-          RenderBlock {UL} at (2,26) size 780x112
-            RenderListItem {LI} at (40,0) size 740x112
-              RenderBlock (anonymous) at (0,0) size 740x28
-                RenderListMarker at (-22,0) size 9x28: bullet
-              RenderBlock {UL} at (0,28) size 740x28
-                RenderListItem {LI} at (40,0) size 700x28
-                  RenderListMarker at (-22,0) size 9x28: white bullet
-                  RenderText {#text} at (683,0) size 17x28
-                    text run at (683,0) width 17: "A"
-              RenderBlock {DIV} at (0,56) size 740x56
-                RenderBlock {UL} at (0,0) size 740x56
-                  RenderListItem {LI} at (40,0) size 700x56
-                    RenderListMarker at (-22,0) size 9x28: white bullet
-                    RenderInline {A} at (0,0) size 16x28 [color=#0000EE]
-                      RenderText {#text} at (678,0) size 16x28
-                        text run at (678,0) width 16: "B"
-                    RenderText {#text} at (694,0) size 6x28
-                      text run at (694,0) width 6: " "
-                    RenderBR {BR} at (700,22) size 0x0
-                    RenderText {#text} at (684,28) size 16x28
-                      text run at (684,28) width 16: "C"
-              RenderBlock (anonymous) at (0,112) size 740x0
-          RenderBlock {DIV} at (2,162) size 780x0
-            RenderBlock {UL} at (0,0) size 780x0
-caret: position 1 of child 3 {#text} of child 0 {LI} of child 0 {UL} of child 1 {DIV} of child 0 {LI} of child 1 {UL} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.checksum b/LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.checksum
deleted file mode 100644 (file)
index 1256c13..0000000
+++ /dev/null
@@ -1 +0,0 @@
-30ab7624c9a30de488458dbd565b5afc
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.png b/LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.png
deleted file mode 100644 (file)
index a407dee..0000000
Binary files a/LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/paste-list-001-expected.txt
deleted file mode 100644 (file)
index 8d4cfad..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 6 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: shouldInsertNode:#document-fragment replacingDOMRange:range from 21 of #text > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 21 of #text > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > DIV > BODY > HTML > #document toDOMRange:range from 21 of #text > LI > OL > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > LI > OL > 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 784x272 [border: (2px solid #FF0000)]
-        RenderBlock (anonymous) at (14,14) size 756x28
-          RenderInline {SPAN} at (0,0) size 151x28
-            RenderText {#text} at (0,0) size 151x28
-              text run at (0,0) width 151: "Empty list item"
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {P} at (14,66) size 756x0
-        RenderBlock {OL} at (14,66) size 756x168
-          RenderListItem {LI} at (40,0) size 716x28
-            RenderListMarker at (-31,0) size 24x28: "1"
-            RenderText {#text} at (0,0) size 211x28
-              text run at (0,0) width 211: "I should be number 1."
-          RenderListItem {LI} at (40,28) size 716x28
-            RenderListMarker at (-31,0) size 24x28: "2"
-          RenderListItem {LI} at (40,56) size 716x112
-            RenderBlock (anonymous) at (0,0) size 716x28
-              RenderListMarker at (-31,0) size 24x28: "3"
-              RenderText {#text} at (0,0) size 211x28
-                text run at (0,0) width 211: "I should be number 3."
-            RenderBlock {OL} at (0,28) size 716x84
-              RenderListItem {LI} at (40,0) size 676x28
-                RenderListMarker at (-31,0) size 24x28: "1"
-                RenderText {#text} at (0,0) size 211x28
-                  text run at (0,0) width 211: "I should be number 1."
-              RenderListItem {LI} at (40,28) size 676x28
-                RenderListMarker at (-31,0) size 24x28: "2"
-              RenderListItem {LI} at (40,56) size 676x28
-                RenderListMarker at (-31,0) size 24x28: "3"
-                RenderText {#text} at (0,0) size 211x28
-                  text run at (0,0) width 211: "I should be number 3."
-            RenderBlock (anonymous) at (0,112) size 716x0
-caret: position 21 of child 0 {#text} of child 2 {LI} of child 1 {OL} of child 5 {LI} of child 4 {OL} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.checksum b/LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.checksum
deleted file mode 100644 (file)
index 343835b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-777d7a83126beefc8ce27794b51e36a6
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.png b/LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.png
deleted file mode 100644 (file)
index f86263b..0000000
Binary files a/LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/paste-table-001-expected.txt
deleted file mode 100644 (file)
index 718781c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 4 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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 2 of P > DIV > BODY > HTML > #document to 2 of P > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 2 of P > DIV > BODY > HTML > #document to 2 of P > DIV > BODY > HTML > #document toDOMRange:range from 32 of #text > TD > TR > TBODY > TABLE > P > DIV > BODY > HTML > #document to 32 of #text > TD > TR > TBODY > TABLE > P > 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 784x212 [border: (2px solid #FF0000)]
-        RenderBlock (anonymous) at (14,14) size 756x28
-          RenderInline {SPAN} at (0,0) size 161x28
-            RenderText {#text} at (0,0) size 161x28
-              text run at (0,0) width 161: "Empty table cell"
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {P} at (14,66) size 756x108
-          RenderTable {TABLE} at (0,0) size 292x54 [border: (2px outset #808080)]
-            RenderTableSection {TBODY} at (2,2) size 288x50
-              RenderTableRow {TR} at (0,2) size 288x22
-                RenderTableCell {TD} at (2,2) size 81x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 77x18
-                    text run at (2,2) width 77: "Left column"
-                RenderTableCell {TD} at (85,2) size 201x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 86x18
-                    text run at (2,2) width 86: "Right column"
-              RenderTableRow {TR} at (0,26) size 288x22
-                RenderTableCell {TD} at (2,35) size 81x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-                RenderTableCell {TD} at (85,26) size 201x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 197x18
-                    text run at (2,2) width 197: "I should be in the right column."
-          RenderTable {TABLE} at (0,54) size 292x54 [border: (2px outset #808080)]
-            RenderTableSection {TBODY} at (2,2) size 288x50
-              RenderTableRow {TR} at (0,2) size 288x22
-                RenderTableCell {TD} at (2,2) size 81x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 77x18
-                    text run at (2,2) width 77: "Left column"
-                RenderTableCell {TD} at (85,2) size 201x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 86x18
-                    text run at (2,2) width 86: "Right column"
-              RenderTableRow {TR} at (0,26) size 288x22
-                RenderTableCell {TD} at (2,35) size 81x4 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
-                RenderTableCell {TD} at (85,26) size 201x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 197x18
-                    text run at (2,2) width 197: "I should be in the right column."
-          RenderBlock (anonymous) at (0,108) size 756x0
-            RenderText {#text} at (0,0) size 0x0
-caret: position 32 of child 0 {#text} of child 1 {TD} of child 1 {TR} of child 0 {TBODY} of child 2 {TABLE} of child 3 {P} of child 1 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/pasteboard/paste-4039777-fix-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/paste-4039777-fix-expected.txt
deleted file mode 100644 (file)
index 92153fc..0000000
+++ /dev/null
@@ -1,80 +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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of #text > LI > UL > DIV > DIV > BODY > HTML > #document to 5 of #text > LI > UL > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > LI > UL > DIV > LI > UL > DIV > DIV > BODY > HTML > #document to 1 of #text > LI > UL > DIV > LI > UL > DIV > 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 784x364 [border: (2px solid #0000FF)]
-        RenderBlock {DIV} at (14,14) size 756x93
-          RenderText {#text} at (0,0) size 67x32
-            text run at (0,0) width 67: "Tests: "
-          RenderBR {BR} at (0,0) size 0x0
-          RenderText {#text} at (0,31) size 117x32
-            text run at (0,31) width 117: "Bug fix for "
-          RenderInline {A} at (0,0) size 275x32 [color=#0000EE]
-            RenderText {#text} at (117,31) size 275x32
-              text run at (117,31) width 275: "<rdar://problem/4039777>"
-          RenderText {#text} at (392,31) size 691x63
-            text run at (392,31) width 299: " Pasting particular snippet of"
-            text run at (0,62) width 672: "HTML containing list items and a link creates too many list items"
-        RenderBlock {DIV} at (14,123) size 756x203
-          RenderBlock (anonymous) at (0,0) size 756x62
-            RenderText {#text} at (0,0) size 189x32
-              text run at (0,0) width 189: "Expected Results: "
-            RenderBR {BR} at (189,24) size 0x0
-            RenderText {#text} at (0,31) size 155x32
-              text run at (0,31) width 155: "Should match: "
-            RenderBR {BR} at (155,55) size 0x0
-          RenderBlock {UL} at (0,86) size 756x31
-            RenderListItem {LI} at (40,0) size 716x31
-              RenderListMarker at (-24,0) size 10x32: bullet
-              RenderText {#text} at (699,0) size 17x32
-                text run at (699,0) width 17: "A"
-          RenderBlock {DIV} at (0,141) size 756x62
-            RenderBlock {UL} at (0,0) size 756x62
-              RenderListItem {LI} at (40,0) size 716x62
-                RenderListMarker at (-24,0) size 10x32: bullet
-                RenderInline {A} at (0,0) size 16x32 [color=#0000EE]
-                  RenderText {#text} at (0,0) size 16x32
-                    text run at (0,0) width 16: "B"
-                RenderText {#text} at (16,0) size 6x32
-                  text run at (16,0) width 6: " "
-                RenderBR {BR} at (0,0) size 0x0
-                RenderText {#text} at (0,31) size 17x32
-                  text run at (0,31) width 17: "C"
-      RenderBlock {DIV} at (0,388) size 784x176
-        RenderBlock {DIV} at (0,0) size 784x176 [border: (2px solid #FF0000)]
-          RenderBlock {UL} at (2,26) size 780x124
-            RenderListItem {LI} at (40,0) size 740x124
-              RenderBlock (anonymous) at (0,0) size 740x31
-                RenderListMarker at (-24,0) size 10x32: bullet
-              RenderBlock {UL} at (0,31) size 740x31
-                RenderListItem {LI} at (40,0) size 700x31
-                  RenderListMarker at (-24,0) size 10x32: white bullet
-                  RenderText {#text} at (683,0) size 17x32
-                    text run at (683,0) width 17: "A"
-              RenderBlock {DIV} at (0,62) size 740x62
-                RenderBlock {UL} at (0,0) size 740x62
-                  RenderListItem {LI} at (40,0) size 700x62
-                    RenderListMarker at (-24,0) size 10x32: white bullet
-                    RenderInline {A} at (0,0) size 16x32 [color=#0000EE]
-                      RenderText {#text} at (678,0) size 16x32
-                        text run at (678,0) width 16: "B"
-                    RenderText {#text} at (694,0) size 6x32
-                      text run at (694,0) width 6: " "
-                    RenderBR {BR} at (700,24) size 0x0
-                    RenderText {#text} at (683,31) size 17x32
-                      text run at (683,31) width 17: "C"
-              RenderBlock (anonymous) at (0,124) size 740x0
-          RenderBlock {DIV} at (2,174) size 780x0
-            RenderBlock {UL} at (0,0) size 780x0
-caret: position 1 of child 3 {#text} of child 0 {LI} of child 0 {UL} of child 1 {DIV} of child 0 {LI} of child 1 {UL} of child 1 {DIV} of child 3 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/pasteboard/paste-list-001-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/paste-list-001-expected.txt
deleted file mode 100644 (file)
index 1d31c10..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 6 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: shouldInsertNode:#document-fragment replacingDOMRange:range from 21 of #text > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 21 of #text > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > DIV > BODY > HTML > #document toDOMRange:range from 21 of #text > LI > OL > LI > OL > DIV > BODY > HTML > #document to 21 of #text > LI > OL > LI > OL > 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 784x293 [border: (2px solid #FF0000)]
-        RenderBlock (anonymous) at (14,14) size 756x31
-          RenderInline {SPAN} at (0,0) size 158x32
-            RenderText {#text} at (0,0) size 158x32
-              text run at (0,0) width 158: "Empty list item"
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {P} at (14,69) size 756x0
-        RenderBlock {OL} at (14,69) size 756x186
-          RenderListItem {LI} at (40,0) size 716x31
-            RenderListMarker at (-32,0) size 24x32: "1"
-            RenderText {#text} at (0,0) size 223x32
-              text run at (0,0) width 223: "I should be number 1."
-          RenderListItem {LI} at (40,31) size 716x31
-            RenderListMarker at (-32,0) size 24x32: "2"
-          RenderListItem {LI} at (40,62) size 716x124
-            RenderBlock (anonymous) at (0,0) size 716x31
-              RenderListMarker at (-32,0) size 24x32: "3"
-              RenderText {#text} at (0,0) size 223x32
-                text run at (0,0) width 223: "I should be number 3."
-            RenderBlock {OL} at (0,31) size 716x93
-              RenderListItem {LI} at (40,0) size 676x31
-                RenderListMarker at (-32,0) size 24x32: "1"
-                RenderText {#text} at (0,0) size 223x32
-                  text run at (0,0) width 223: "I should be number 1."
-              RenderListItem {LI} at (40,31) size 676x31
-                RenderListMarker at (-32,0) size 24x32: "2"
-              RenderListItem {LI} at (40,62) size 676x31
-                RenderListMarker at (-32,0) size 24x32: "3"
-                RenderText {#text} at (0,0) size 223x32
-                  text run at (0,0) width 223: "I should be number 3."
-            RenderBlock (anonymous) at (0,124) size 716x0
-caret: position 21 of child 0 {#text} of child 2 {LI} of child 1 {OL} of child 5 {LI} of child 4 {OL} of child 1 {DIV} of body