summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorsidchat@google.com <sidchat@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-14 22:02:45 +0000
committersidchat@google.com <sidchat@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-14 22:02:45 +0000
commit58c3b8b1dc98f264d9758077240e9806373fe62f (patch)
tree63afad96c4a43eae932d1204db6c673376aaeeb8 /webkit
parente54f30d8f180827b528bd83ca05563e823d1121a (diff)
downloadchromium_src-58c3b8b1dc98f264d9758077240e9806373fe62f.zip
chromium_src-58c3b8b1dc98f264d9758077240e9806373fe62f.tar.gz
chromium_src-58c3b8b1dc98f264d9758077240e9806373fe62f.tar.bz2
Rebaseline an editing layout test. The expected output was assuming a bug where the caret would be one pixel off. The merge resolved that bug - i.e., the caret is no longer off by a pixel.
Review URL: http://codereview.chromium.org/18242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.pngbin11703 -> 11693 bytes
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt2
3 files changed, 1 insertions, 3 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.checksum
index 5bbaa26..40a1a43 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.checksum
@@ -1 +1 @@
-0a6a02a71836a53ba426fc00298181fe \ No newline at end of file
+31cf4734d393d980dd4b434fdba3be9c \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.png
index 029d3f3..e9cf0b0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/style/smoosh-styles-003-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 25765a7..281c538 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1223,8 +1223,6 @@ LayoutTests/fast/forms/selection-functions.html = FAIL
// MERGE REGRESSIONS 36102:37604
-// Caret may be off, but it may just need rebaselining.
-WIN : LayoutTests/editing/style/smoosh-styles-003.html = FAIL
WIN : LayoutTests/fast/css/line-height-overflow.html = FAIL
LINUX WIN : LayoutTests/fast/events/mouse-click-events.html = FAIL
WIN : LayoutTests/fast/flexbox/009.html = FAIL