Rebaselines the test editing/deleting/delete-4038408-fix.html. This

test needs to be rebaselined for two reasons:

. The expected text output changed upstream as the result of WebKit
  change 38337.
. The left/right border colors are slightly different. As you said in
  person, we're not stressing over these and I should just rebaseline.

BUG=none
TEST=none

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

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

4 files changed, 6 insertions, 14 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.checksum
index 151e1c5..d0277d0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.checksum
@@ -1 +1 @@
-1bc7bee3cd23bdd788d2b9da7c1850a7
\ No newline at end of file
+72432b3a68ea4528631381c5884ebf7f
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.png
index a14c1d8..1d0dbf3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.txt
index 0e5cc4a..fb7f551 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/delete-4038408-fix-expected.txt
@@ -5,21 +5,12 @@ EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > DIV > BODY
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document
 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 35 of #text > DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document
+EDITING DELEGATE: shouldDeleteDOMRange:range from 35 of #text > DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 35 of #text > DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document to 35 of #text > DIV > BLOCKQUOTE > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index f9034a7..ade9004 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1313,7 +1313,8 @@ LayoutTests/fast/canvas/canvas-pattern-transform.html = FAIL
 // Bug 5053: fails (maybe V8?)
 LayoutTests/fast/frames/cross-site-this.html = FAIL
 
-LINUX WIN : LayoutTests/editing/deleting/delete-4038408-fix.html = FAIL
+// Expected output changed upstream and needs to be rebaselined on Linux.
+LINUX : LayoutTests/editing/deleting/delete-4038408-fix.html = FAIL
 
 // MERGE 38389:38450
 LINUX WIN : LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-4.html = FAIL