Rebaseline a passing test.

TBR=japhet
TEST=none
BUG=none

Review URL: http://codereview.chromium.org/543020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35979 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 41 insertions, 5 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.checksum
index db44925..7da5193 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.checksum
@@ -1 +1 @@
-f9e53eae6c5efc9ce426f2c306f2f171
\ No newline at end of file
+06cf31e143387e3b3b22e7e6a18d97a7
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.png
index ed71721..c5d0da4 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.txt
new file mode 100644
index 0000000..6a1817a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.txt
@@ -0,0 +1,36 @@
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 2 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document toDOMRange:range from 6 of #text > BODY > HTML > #document to 6 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > BODY > HTML > #document to 6 of #text > BODY > HTML > #document toDOMRange:range from 4 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document givenAction:WebViewInsertActionDropped
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 0 of #text > BODY > HTML > #document to 4 of #text > 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 (0,0) size 800x584
+      RenderBlock (anonymous) at (0,0) size 800x304
+        RenderPartObject {IFRAME} at (0,0) size 304x304 [border: (2px inset #000000)]
+          layer at (0,0) size 300x300
+            RenderView at (0,0) size 300x300
+          layer at (0,0) size 300x300
+            RenderBlock {HTML} at (0,0) size 300x300
+              RenderBody {BODY} at (8,8) size 284x284 [bgcolor=#FFFFE0]
+                RenderText {#text} at (0,0) size 45x19
+                  text run at (0,0) width 45: "foo baz"
+                RenderText {#text} at (45,0) size 24x19
+                  text run at (45,0) width 24: " bar"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,320) size 800x40
+        RenderText {#text} at (0,0) size 774x39
+          text run at (0,0) width 774: "This test uses the eventSender to do drag and drop. To run it manually, drag the word selected in the above subframe and drop it"
+          text run at (0,20) width 66: "after 'baz'. "
+          text run at (66,20) width 204: "The result should be 'foo baz bar'."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.checksum
index 74341d8..933aa12 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.checksum
@@ -1 +1 @@
-11035a7aea8d6610d26f8d26e366a3b6
\ No newline at end of file
+cd6aa7d07c18ea2eb37dd283ee00dd13
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.png
index c85cef5..1184d54 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.txt
index 79aa439..26b8e7b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.txt
@@ -9,7 +9,7 @@ EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotificatio
 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > BODY > HTML > #document to 6 of #text > BODY > HTML > #document toDOMRange:range from 4 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document givenAction:WebViewInsertActionDropped
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 0 of #text > BODY > HTML > #document to 5 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 4 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 0 of #text > BODY > HTML > #document to 1 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 layer at (0,0) size 800x600
@@ -26,8 +26,9 @@ layer at (0,0) size 800x600
               RenderBody {BODY} at (8,8) size 284x284 [bgcolor=#FFFFE0]
                 RenderText {#text} at (0,0) size 45x19
                   text run at (0,0) width 45: "foo baz"
-                RenderText {#text} at (45,0) size 28x19
+                RenderText {#text} at (45,0) size 24x19
                   text run at (45,0) width 24: " bar"
+                RenderText {#text} at (69,0) size 4x19
                   text run at (69,0) width 4: " "
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,320) size 800x40
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 84c6c3a..1c77927 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2299,7 +2299,6 @@ BUG9786 : LayoutTests/http/tests/security/cross-frame-access-document-direct.htm
 BUG10479 MAC : LayoutTests/svg/hixie/perf/001.xml = FAIL
 BUG10479 MAC : LayoutTests/svg/hixie/perf/002.xml = FAIL
 
-BUG9798 LINUX WIN : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL
 BUG9798 SLOW WIN DEBUG : LayoutTests/fast/dom/Window/slow_unload_handler.html = PASS
 BUG9798 LINUX DEBUG SLOW : LayoutTests/fast/frames/calculate-round.html = CRASH PASS
 BUG9798 RELEASE : LayoutTests/fast/frames/frame-limit.html = CRASH PASS