diff options
author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-24 19:58:30 +0000 |
---|---|---|
committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-24 19:58:30 +0000 |
commit | 54c88791466258f5a4df968485c51aee2ce2e482 (patch) | |
tree | acf7d6cd6175f5cdf36837aa1c78493efe893b5f /webkit | |
parent | 6adf9a80967cbfdb16ed2e8639dc0a6af4d64bc8 (diff) | |
download | chromium_src-54c88791466258f5a4df968485c51aee2ce2e482.zip chromium_src-54c88791466258f5a4df968485c51aee2ce2e482.tar.gz chromium_src-54c88791466258f5a4df968485c51aee2ce2e482.tar.bz2 |
Rebaseline test that changed upstream.
BUG=15132
TEST=NONE
Review URL: http://codereview.chromium.org/147094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
4 files changed, 4 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.checksum index a1183bd..6ae5017 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.checksum @@ -1 +1 @@ -0af11f8a744e3c73a8a6b9eda84480c9
\ No newline at end of file +94f62db4ab722d36f231894b6de7905e
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.png Binary files differindex 29dff3d..06f10ad 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.txt index 70e72fb..d69bc5d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/execCommand/remove-formatting-2-expected.txt @@ -16,9 +16,7 @@ layer at (0,0) size 800x600 text run at (0,0) width 755: "This tests that RemoveFormat not only removes style from the selected part of the DOM, but that it also applies the document" text run at (0,20) width 534: "default style to the selection if that's necessary in order to leave the selected text unstyled." RenderBlock {DIV} at (0,56) size 784x20 - RenderText {#text} at (0,0) size 25x19 - text run at (0,0) width 25: "This" - RenderText {#text} at (25,0) size 267x19 - text run at (25,0) width 267: " text should look the same as the text above." + RenderText {#text} at (0,0) size 292x19 + text run at (0,0) width 292: "This text should look the same as the text above." selection start: position 0 of child 0 {#text} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document selection end: position 4 of child 0 {#text} of child 2 {DIV} 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 ffc3524..573cb17 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2744,7 +2744,7 @@ BUG14831 : LayoutTests/fast/events/event-trace.html = FAIL // WebKit 44922:44927 BUG14885 : LayoutTests/fast/js/JSON-parse.html = FAIL -BUG14889 REBASELINE : LayoutTests/http/tests/security/xssAuditor/link-opens-new-window.html = FAIL +BUG14889 : LayoutTests/http/tests/security/xssAuditor/link-opens-new-window.html = FAIL // WebKit 44928:44943 BUG14946 : LayoutTests/fast/js/date-toisostring.html = FAIL @@ -2768,7 +2768,6 @@ BUG15132 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source.htm BUG15132 SKIP : LayoutTests/compositing/reflections/reflection-on-composited.html = FAIL // more unexpected failures BUG15132 WIN LINUX : LayoutTests/editing/execCommand/5482023.html = FAIL -BUG15132 WIN LINUX : LayoutTests/editing/execCommand/remove-formatting-2.html = FAIL BUG15132 WIN LINUX : LayoutTests/editing/inserting/editable-html-element.html = FAIL BUG15132 WIN LINUX : LayoutTests/editing/pasteboard/4989774.html = FAIL BUG15132 WIN LINUX : LayoutTests/editing/selection/4983858.html = FAIL |