summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4076267-2-expected.txt61
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.pngbin5995 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.txt2
-rwxr-xr-x[-rw-r--r--]webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt40
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.pngbin5444 -> 5450 bytes
-rwxr-xr-x[-rw-r--r--]webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt43
-rwxr-xr-x[-rw-r--r--]webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/bad-placeholder-expected.txt58
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt10
-rwxr-xr-x[-rw-r--r--]webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt98
-rwxr-xr-x[-rw-r--r--]webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-019-expected.txt119
-rwxr-xr-x[-rw-r--r--]webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt30
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt20
14 files changed, 226 insertions, 258 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4076267-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4076267-2-expected.txt
index 28bf872..79d500a 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4076267-2-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4076267-2-expected.txt
@@ -1,32 +1,29 @@
-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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 96 of #text > DIV > DIV > BODY > HTML > #document
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldInsertText:there should be a single trailing space between the '.' and the last character in this sentence replacingDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 96 of #text > DIV > DIV > BODY > HTML > #document to 96 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 96 of #text > DIV > DIV > BODY > HTML > #document to 96 of #text > 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 {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 365x19
- text run at (0,0) width 365: "This tests to see if trailing spaces are lost during a copy/paste"
- RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)]
- RenderBlock {DIV} at (0,46) size 784x28 [border: (2px solid #FFAAAA)]
- RenderBlock (anonymous) at (2,2) size 780x0
- RenderBlock {DIV} at (2,2) size 780x24 [border: (2px solid #AAAAFF)]
- RenderText {#text} at (2,2) size 543x19
- text run at (2,2) width 543: "there should be a single trailing space between the '.' and the last character in this sentence "
- RenderText {#text} at (545,2) size 4x19
- text run at (545,2) width 4: "."
-caret: position 96 of child 0 {#text} of child 0 {DIV} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+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: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 96 of #text > DIV > DIV > BODY > HTML > #document
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 1 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldInsertText:there should be a single trailing space between the '.' and the last character in this sentence replacingDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document toDOMRange:range from 96 of #text > DIV > DIV > BODY > HTML > #document to 96 of #text > 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 {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 365x19
+ text run at (0,0) width 365: "This tests to see if trailing spaces are lost during a copy/paste"
+ RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {DIV} at (0,46) size 784x28 [border: (2px solid #FFAAAA)]
+ RenderBlock {DIV} at (2,2) size 780x24 [border: (2px solid #AAAAFF)]
+ RenderText {#text} at (2,2) size 547x19
+ text run at (2,2) width 547: "there should be a single trailing space between the '.' and the last character in this sentence ."
+caret: position 96 of child 0 {#text} of child 1 {DIV} of child 5 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.checksum
deleted file mode 100644
index 29674a5..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-7b998bdeae1102253ebc060d8e09e21c \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.png
deleted file mode 100644
index ec1e4e84..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.txt
deleted file mode 100644
index 1234bfc..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/4840662-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This tests for a crash when pasting into a link that is display:block. 'bar' is pasted between 'foo' and 'baz', and must be part of the link in order to acheive the expected paragraph structure. It should be part of the link but of the default font style. 'bar' shouldn't be underlined and the second style span is unnecessary, since its only property is overridden by its only child.
-<a id="anchor" href="http://www.google.com/" style="display:block;">foo<span class="Apple-style-span" style="color: rgb(0, 0, 0); -webkit-text-decorations-in-effect: none; ">bar<span class="Apple-style-span" style="-webkit-text-decorations-in-effect: none; "><a id="anchor" href="http://www.google.com/" style="display: inline !important; ">baz</a></span></span></a>
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt
index 9c52cef..1b00bb6 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5156401-1-expected.txt
@@ -1,23 +1,17 @@
-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 {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 426x19
- text run at (0,0) width 426: "This tests for a crash when pasting content into a link inside a table cell."
- RenderBlock {DIV} at (0,36) size 784x30
- RenderTable {TABLE} at (0,0) size 137x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 135x28
- RenderTableRow {TR} at (0,2) size 135x24
- RenderTableCell {TD} at (2,2) size 131x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderInline {A} at (0,0) size 127x19 [color=#0000EE]
- RenderText {#text} at (2,2) size 9x19
- text run at (2,2) width 9: "T"
- RenderText {#text} at (11,2) size 114x19
- text run at (11,2) width 114: "his should be a link"
- RenderInline {SPAN} at (0,0) size 4x19 [color=#000000]
- RenderInline {A} at (0,0) size 4x19 [color=#0000EE]
- RenderText {#text} at (125,2) size 4x19
- text run at (125,2) width 4: "."
-caret: position 20 of child 1 {#text} of child 0 {A} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+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 {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 426x19
+ text run at (0,0) width 426: "This tests for a crash when pasting content into a link inside a table cell."
+ RenderBlock {DIV} at (0,36) size 784x30
+ RenderTable {TABLE} at (0,0) size 137x30 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 135x28
+ RenderTableRow {TR} at (0,2) size 135x24
+ RenderTableCell {TD} at (2,2) size 131x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderInline {A} at (0,0) size 127x19 [color=#0000EE]
+ RenderText {#text} at (2,2) size 127x19
+ text run at (2,2) width 127: "This should be a link."
+caret: position 21 of child 0 {#text} of child 0 {A} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 3 {DIV} of child 0 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.checksum
index 7790324..ca53a09 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.checksum
@@ -1 +1 @@
-17d2554df9e108194ca870f5badc0334 \ No newline at end of file
+a756faca1137a506f8af67750ffb641b \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.png
index 1ae35a4..ca46a42 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt
index 4acea95..36e7884 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/5387578-expected.txt
@@ -1,23 +1,20 @@
-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 {P} at (0,0) size 784x40
- RenderText {#text} at (0,0) size 744x39
- text run at (0,0) width 356: "This tests for a crash when pasting content into a table cell. "
- text run at (356,0) width 388: "The table cell has some collapsed whitespace at the end of it that"
- text run at (0,20) width 106: "tickled the crash. "
- text run at (106,20) width 316: "You should see 'Hello World' in the table cell below."
- RenderBlock {DIV} at (0,56) size 784x30
- RenderTable {TABLE} at (0,0) size 89x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 87x28
- RenderTableRow {TR} at (0,2) size 87x24
- RenderTableCell {TD} at (2,2) size 83x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 51x19
- text run at (2,2) width 51: "Hello W"
- RenderText {#text} at (53,2) size 24x19
- text run at (53,2) width 24: "orld"
- RenderText {#text} at (77,2) size 4x19
- text run at (77,2) width 4: " "
-caret: position 4 of child 1 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
+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 {P} at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 744x39
+ text run at (0,0) width 356: "This tests for a crash when pasting content into a table cell. "
+ text run at (356,0) width 388: "The table cell has some collapsed whitespace at the end of it that"
+ text run at (0,20) width 106: "tickled the crash. "
+ text run at (106,20) width 316: "You should see 'Hello World' in the table cell below."
+ RenderBlock {DIV} at (0,56) size 784x30
+ RenderTable {TABLE} at (0,0) size 85x30 [border: (1px outset #808080)]
+ RenderTableSection {TBODY} at (1,1) size 83x28
+ RenderTableRow {TR} at (0,2) size 83x24
+ RenderTableCell {TD} at (2,2) size 79x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderText {#text} at (2,2) size 75x19
+ text run at (2,2) width 75: "Hello World"
+ text run at (77,2) width 0: " \x{9}\x{9} \x{9}\x{9}"
+caret: position 11 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 2 {DIV} of child 0 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/bad-placeholder-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/bad-placeholder-expected.txt
index ffbaa8d..7a98966 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/bad-placeholder-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/bad-placeholder-expected.txt
@@ -1,30 +1,28 @@
-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: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 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 {P} at (0,0) size 784x40
- RenderText {#text} at (0,0) size 777x39
- text run at (0,0) width 777: "This is a test to make sure that a placeholder, even one without our special class on it, is removed only when it has been collapsed"
- text run at (0,20) width 329: "away or when it has been displaced by pasted content."
- RenderBlock {P} at (0,56) size 784x40
- RenderText {#text} at (0,0) size 776x39
- text run at (0,0) width 659: "Placeholders with our special class can, through bugs in deletion, be inserted into the document unnecessarily. "
- text run at (659,0) width 117: "Once that happens,"
- text run at (0,20) width 672: "we don't want to make matters worse by removing them if they are acting as line breaks instead of placeholders."
- RenderBlock {DIV} at (0,112) size 784x40
- RenderText {#text} at (0,0) size 27x19
- text run at (0,0) width 27: "First"
- RenderText {#text} at (27,0) size 69x19
- text run at (27,0) width 69: " paragraph."
- RenderBR {BR} at (96,15) size 0x0
- RenderText {#text} at (0,20) size 115x19
- text run at (0,20) width 115: "Second paragraph."
-caret: position 11 of child 1 {#text} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+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: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 16 of #text > DIV > BODY > HTML > #document to 16 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 {P} at (0,0) size 784x40
+ RenderText {#text} at (0,0) size 777x39
+ text run at (0,0) width 777: "This is a test to make sure that a placeholder, even one without our special class on it, is removed only when it has been collapsed"
+ text run at (0,20) width 329: "away or when it has been displaced by pasted content."
+ RenderBlock {P} at (0,56) size 784x40
+ RenderText {#text} at (0,0) size 776x39
+ text run at (0,0) width 659: "Placeholders with our special class can, through bugs in deletion, be inserted into the document unnecessarily. "
+ text run at (659,0) width 117: "Once that happens,"
+ text run at (0,20) width 672: "we don't want to make matters worse by removing them if they are acting as line breaks instead of placeholders."
+ RenderBlock {DIV} at (0,112) size 784x40
+ RenderText {#text} at (0,0) size 96x19
+ text run at (0,0) width 96: "First paragraph."
+ RenderBR {BR} at (96,15) size 0x0
+ RenderText {#text} at (0,20) size 115x19
+ text run at (0,20) width 115: "Second paragraph."
+caret: position 16 of child 0 {#text} of child 4 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt
deleted file mode 100644
index fedd01f..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt
+++ /dev/null
@@ -1,10 +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: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 11 of #text > A > B > TD > TR > TBODY > TABLE > TD > TR > TBODY > TABLE > DIV > BODY > HTML > #document to 11 of #text > A > B > TD > TR > TBODY > TABLE > TD > TR > TBODY > TABLE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-
-Canton Repository (subscription) all 7hello world9 news articles                             
-
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt
index f319335..c5076c0 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-match-style-001-expected.txt
@@ -1,51 +1,47 @@
-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: shouldDeleteDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 2 of #text > DIV > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > B > DIV > DIV > BODY > HTML > #document to 1 of #text > B > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldInsertText:b replacingDOMRange:range from 1 of #text > B > DIV > DIV > BODY > HTML > #document to 1 of #text > B > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > B > DIV > DIV > BODY > HTML > #document to 1 of #text > B > DIV > DIV > BODY > HTML > #document toDOMRange:range from 1 of #text > B > DIV > DIV > BODY > HTML > #document to 1 of #text > B > 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 784x209 [border: (2px solid #0000FF)]
- RenderBlock {DIV} at (14,14) size 756x55
- 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 262x27
- text run at (0,27) width 262: "Pasting and matching style."
- RenderBlock {DIV} at (14,85) size 756x110
- 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 737x55
- text run at (0,27) width 737: "The pasted letter should match the style of the preexisting bold letter. Should"
- text run at (0,55) width 364: "see this content in the red box below: "
- RenderBR {BR} at (364,76) size 0x0
- RenderInline {B} at (0,0) size 25x26
- RenderText {#text} at (0,83) size 25x26
- text run at (0,83) width 25: "ab"
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,233) size 784x31
- RenderBlock {DIV} at (0,0) size 784x31 [border: (2px solid #FF0000)]
- RenderInline {B} at (0,0) size 25x26
- RenderText {#text} at (2,2) size 12x26
- text run at (2,2) width 12: "a"
- RenderText {#text} at (14,2) size 13x26
- text run at (14,2) width 13: "b"
- RenderBlock (anonymous) at (0,31) size 784x0
- RenderText {#text} at (0,0) size 0x0
-caret: position 1 of child 1 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+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: shouldDeleteDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 2 of #text > DIV > DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > B > DIV > DIV > BODY > HTML > #document to 1 of #text > B > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldInsertText:b replacingDOMRange:range from 1 of #text > B > DIV > DIV > BODY > HTML > #document to 1 of #text > B > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of #text > B > DIV > DIV > BODY > HTML > #document to 1 of #text > B > DIV > DIV > BODY > HTML > #document toDOMRange:range from 2 of #text > B > DIV > DIV > BODY > HTML > #document to 2 of #text > B > 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 784x209 [border: (2px solid #0000FF)]
+ RenderBlock {DIV} at (14,14) size 756x55
+ 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 262x27
+ text run at (0,27) width 262: "Pasting and matching style."
+ RenderBlock {DIV} at (14,85) size 756x110
+ 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 737x55
+ text run at (0,27) width 737: "The pasted letter should match the style of the preexisting bold letter. Should"
+ text run at (0,55) width 364: "see this content in the red box below: "
+ RenderBR {BR} at (364,76) size 0x0
+ RenderInline {B} at (0,0) size 25x26
+ RenderText {#text} at (0,83) size 25x26
+ text run at (0,83) width 25: "ab"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,233) size 784x31
+ RenderBlock {DIV} at (0,0) size 784x31 [border: (2px solid #FF0000)]
+ RenderInline {B} at (0,0) size 25x26
+ RenderText {#text} at (2,2) size 25x26
+ text run at (2,2) width 25: "ab"
+caret: position 2 of child 0 {#text} of child 0 {B} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-019-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-019-expected.txt
index e81b4b5..a67afbf 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-019-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/paste-text-019-expected.txt
@@ -1,60 +1,59 @@
-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: 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: shouldInsertText:Bar replacingDOMRange:range from 4 of #text > SPAN > DIV > BODY > HTML > #document to 4 of #text > SPAN > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > SPAN > DIV > BODY > HTML > #document to 4 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 3 of #text > SPAN > DIV > BODY > HTML > #document to 3 of #text > SPAN > 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 784x285 [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 158x27
- text run at (0,27) width 158: "Fix for this bug: "
- RenderInline {A} at (0,0) size 544x27 [color=#0000EE]
- RenderText {#text} at (158,27) size 544x27
- text run at (158,27) width 544: "<http://bugzilla.opendarwin.org/show_bug.cgi?id=3429>"
- RenderText {#text} at (702,27) size 752x55
- text run at (702,27) width 50: " Text"
- text run at (0,55) width 671: "transformed with text-transform does not copy with transform applied"
- RenderBlock {DIV} at (14,113) size 756x158
- 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 198x27
- text run at (0,27) width 198: "Should see the string"
- RenderBlock {PRE} at (0,79) size 756x27
- RenderText {#text} at (0,0) size 210x27
- text run at (0,0) width 210: "Foo Bar baz Bar"
- RenderBlock (anonymous) at (0,130) size 756x28
- RenderText {#text} at (0,0) size 153x27
- text run at (0,0) width 153: "(case sensitive)."
- RenderBlock {DIV} at (0,309) size 784x32 [border: (2px solid #FF0000)]
- RenderInline {SPAN} at (0,0) size 152x27
- RenderInline {SPAN} at (0,0) size 78x27
- RenderText {#text} at (2,2) size 78x27
- text run at (2,2) width 78: "Foo Bar"
- RenderText {#text} at (80,2) size 39x27
- text run at (80,2) width 39: " baz"
- RenderText {#text} at (119,2) size 35x27
- text run at (119,2) width 35: "Bar"
-caret: position 3 of child 2 {#text} of child 1 {SPAN} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
+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: 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: shouldInsertText:Bar replacingDOMRange:range from 4 of #text > SPAN > DIV > BODY > HTML > #document to 4 of #text > SPAN > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > SPAN > DIV > BODY > HTML > #document to 4 of #text > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 7 of #text > SPAN > DIV > BODY > HTML > #document to 7 of #text > SPAN > 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 784x285 [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 158x27
+ text run at (0,27) width 158: "Fix for this bug: "
+ RenderInline {A} at (0,0) size 544x27 [color=#0000EE]
+ RenderText {#text} at (158,27) size 544x27
+ text run at (158,27) width 544: "<http://bugzilla.opendarwin.org/show_bug.cgi?id=3429>"
+ RenderText {#text} at (702,27) size 752x55
+ text run at (702,27) width 50: " Text"
+ text run at (0,55) width 671: "transformed with text-transform does not copy with transform applied"
+ RenderBlock {DIV} at (14,113) size 756x158
+ 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 198x27
+ text run at (0,27) width 198: "Should see the string"
+ RenderBlock {PRE} at (0,79) size 756x27
+ RenderText {#text} at (0,0) size 210x27
+ text run at (0,0) width 210: "Foo Bar baz Bar"
+ RenderBlock (anonymous) at (0,130) size 756x28
+ RenderText {#text} at (0,0) size 153x27
+ text run at (0,0) width 153: "(case sensitive)."
+ RenderBlock {DIV} at (0,309) size 784x32 [border: (2px solid #FF0000)]
+ RenderInline {SPAN} at (0,0) size 152x27
+ RenderInline {SPAN} at (0,0) size 78x27
+ RenderText {#text} at (2,2) size 78x27
+ text run at (2,2) width 78: "Foo Bar"
+ RenderText {#text} at (80,2) size 74x27
+ text run at (80,2) width 74: " bazBar"
+ RenderText {#text} at (0,0) size 0x0
+caret: position 7 of child 1 {#text} of child 1 {SPAN} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt
index b0d6eee..0c970b6 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/drag-text-delay-expected.txt
@@ -1,16 +1,14 @@
-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
- RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-layer at (10,11) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
- RenderText {#text} at (1,0) size 34x16
- text run at (1,0) width 34: " world"
- RenderText {#text} at (35,0) size 27x16
- text run at (35,0) width 27: "hello"
-selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 5 of child 1 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
+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
+ RenderTextControl {INPUT} at (0,0) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+layer at (10,11) size 151x16
+ RenderBlock {DIV} at (2,3) size 151x16
+ RenderText {#text} at (1,0) size 61x16
+ text run at (1,0) width 61: " worldhello"
+selection start: position 6 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
+selection end: position 11 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5dc8e38..67beace 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2474,12 +2474,14 @@ DEFER BUG10621 : LayoutTests/fast/js/array-reduceRight.html = FAIL
DEFER BUG10622 : LayoutTests/fast/js/array-enumerators-functions.html = FAIL
// New regressions from webkit merge 42547:42580
-BUG_TONY : LayoutTests/editing/pasteboard/4076267-2.html = FAIL
-BUG_TONY : LayoutTests/editing/pasteboard/4840662.html = FAIL
-BUG_TONY : LayoutTests/editing/pasteboard/5156401-1.html = FAIL
-BUG_TONY : LayoutTests/editing/pasteboard/5387578.html = FAIL
-BUG_TONY : LayoutTests/editing/pasteboard/bad-placeholder.html = FAIL
-BUG_TONY : LayoutTests/editing/pasteboard/paste-into-anchor-text.html = FAIL
-BUG_TONY : LayoutTests/editing/pasteboard/paste-match-style-001.html = FAIL
-BUG_TONY : LayoutTests/editing/pasteboard/paste-text-019.html = FAIL
-BUG_TONY WIN LINUX : LayoutTests/editing/selection/drag-text-delay.html = FAIL
+// These need to be rebaselined on linux. Caused by
+// http://trac.webkit.org/changeset/42549
+BUG_TONY LINUX : LayoutTests/editing/pasteboard/4076267-2.html = FAIL
+BUG_TONY LINUX : LayoutTests/editing/pasteboard/4840662.html = FAIL
+BUG_TONY LINUX : LayoutTests/editing/pasteboard/5156401-1.html = FAIL
+BUG_TONY LINUX : LayoutTests/editing/pasteboard/5387578.html = FAIL
+BUG_TONY LINUX : LayoutTests/editing/pasteboard/bad-placeholder.html = FAIL
+BUG_TONY LINUX : LayoutTests/editing/pasteboard/paste-into-anchor-text.html = FAIL
+BUG_TONY LINUX : LayoutTests/editing/pasteboard/paste-match-style-001.html = FAIL
+BUG_TONY LINUX : LayoutTests/editing/pasteboard/paste-text-019.html = FAIL
+BUG_TONY LINUX : LayoutTests/editing/selection/drag-text-delay.html = FAIL