summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-12 22:25:24 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-12 22:25:24 +0000
commit07f0b3efd177058fec09cab96d5996624789f25d (patch)
tree0d4c30d17cb6534aa05959e9283ed01d93ea8263
parenta5573dfbf64c469f7a24ec0bcf226394523db865 (diff)
downloadchromium_src-07f0b3efd177058fec09cab96d5996624789f25d.zip
chromium_src-07f0b3efd177058fec09cab96d5996624789f25d.tar.gz
chromium_src-07f0b3efd177058fec09cab96d5996624789f25d.tar.bz2
Fix a layout test, by rebaselining because trailing whitespaces now always get their own linebox. The change that caused this was http://trac.webkit.org/changeset/41569/trunk and you can see that they re-baselined all tests that had trailing whitespaces there. For this test, regular webkit does not select a trailing whitespace (they only select "foo" on double click, we select "foo "), so this wasn't rebased by them.
Review URL: http://codereview.chromium.org/46005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11586 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/subframe-dragndrop-1-expected.txt3
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt1
2 files changed, 2 insertions, 2 deletions
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 a577ec0..79aa439 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
@@ -27,7 +27,8 @@ layer at (0,0) size 800x600
RenderText {#text} at (0,0) size 45x19
text run at (0,0) width 45: "foo baz"
RenderText {#text} at (45,0) size 28x19
- text run at (45,0) width 28: " bar "
+ text run at (45,0) width 24: " bar"
+ text run at (69,0) width 4: " "
RenderText {#text} at (0,0) size 0x0
RenderBlock {P} at (0,320) size 800x40
RenderText {#text} at (0,0) size 774x39
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 5d95633..85ea3b0 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1767,7 +1767,6 @@ LINUX: LayoutTests/fast/compact/001.html = CRASH PASS
LINUX : LayoutTests/fast/inline/long-wrapped-line.html = FAIL
WIN : chrome/fast/dom/java-applet-calls.html = FAIL
LINUX : LayoutTests/editing/execCommand/selectAll.html = FAIL
-WIN : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL
MAC LINUX WIN : LayoutTests/fast/events/onload-single-line-comment.html = TIMEOUT
LINUX : LayoutTests/fast/text/trailing-white-space.html = FAIL
LINUX : LayoutTests/fast/text/trailing-white-space-2.html = FAIL