diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 23:03:29 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 23:03:29 +0000 |
| commit | a100d13626ad0ddeb4b0a7bb81eb9a736acc4d11 (patch) | |
| tree | 57405400e9201a9a2e01552d48aa1dd12feb63c4 | |
| parent | 1fc3a0e64dccfa3d9fc20764a74bbe624b45090f (diff) | |
| download | chromium_src-a100d13626ad0ddeb4b0a7bb81eb9a736acc4d11.zip chromium_src-a100d13626ad0ddeb4b0a7bb81eb9a736acc4d11.tar.gz chromium_src-a100d13626ad0ddeb4b0a7bb81eb9a736acc4d11.tar.bz2 | |
Rebaseline to upstream expectations.
(Equivalent to the mac change in svn diff -r38682:38683 http://svn.webkit.org/repository/webkit/trunk/LayoutTests/platform/mac/editing/deleting/5168598-expected.txt)
Review URL: http://codereview.chromium.org/12966
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6391 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt | 6 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt index 0a6ce84..0460c2d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/deleting/5168598-expected.txt @@ -18,7 +18,5 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 0x0 layer at (10,87) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 - RenderInline {FONT} at (0,0) size 0x16 - RenderInline {SPAN} at (0,0) size 0x16 - RenderBR {BR} at (1,0) size 0x16 -caret: position 0 of child 0 {BR} of child 0 {SPAN} of child 0 {FONT} of child 0 {DIV} of child 3 {INPUT} of child 0 {BODY} of child 0 {HTML} of document + RenderBR {BR} at (1,0) size 0x16 +caret: position 0 of child 0 {BR} of child 0 {DIV} of child 3 {INPUT} of child 0 {BODY} of child 0 {HTML} of document diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 0322957..6058dbb 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1441,7 +1441,7 @@ LayoutTests/transitions/transition-shorthand-delay.html = TIMEOUT // MERGE 38653:38729: Expectations changed upstream LayoutTests/editing/execCommand/19653-4.html = FAIL -LayoutTests/editing/deleting/5168598.html = FAIL +MAC : LayoutTests/editing/deleting/5168598.html = FAIL LayoutTests/editing/deleting/delete-link-1.html = FAIL LINUX WIN : LayoutTests/editing/inserting/insert-before-link-1.html = FAIL LINUX : LayoutTests/editing/execCommand/19089.html = FAIL |