diff options
author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 19:36:49 +0000 |
---|---|---|
committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 19:36:49 +0000 |
commit | ad310d823aa8d94925cd0a4ca34c74956a65f788 (patch) | |
tree | e680d9c1f2236d59b351c7b58f1353286563f6b0 /webkit | |
parent | cd21aaeed16e1fb914d8409dd65c5db7ac01ff89 (diff) | |
download | chromium_src-ad310d823aa8d94925cd0a4ca34c74956a65f788.zip chromium_src-ad310d823aa8d94925cd0a4ca34c74956a65f788.tar.gz chromium_src-ad310d823aa8d94925cd0a4ca34c74956a65f788.tar.bz2 |
Rebaseline failures from WebKit merge 44202:44252
BUG=12282
TEST=green layout bots
Review URL: http://codereview.chromium.org/222015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
6 files changed, 3 insertions, 66 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt deleted file mode 100644 index 9c97138..0000000 --- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt +++ /dev/null @@ -1,28 +0,0 @@ -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Old contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,New contents of frame from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -PASS window.frames.length is 2 -FAIL window.frames[0].frameElement.name should be frame. Threw exception TypeError: Cannot read property 'name' of undefined -FAIL window.frames[1].frameElement.name should be obj. Threw exception TypeError: Cannot read property 'name' of undefined -Loading 'data:text/html,Updated contents of iframe' in iframe... -Loading 'data:text/html,Updated contents of object' in object... -FAIL window.frames[0].location.toString() should be data:text/html,Updated contents of iframe. Threw exception TypeError: Property 'toString' of object #<error> is not a function -FAIL window.frames[1].location.toString() should be data:text/html,Updated contents of object. Threw exception TypeError: Property 'toString' of object #<error> is not a function - diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.checksum index f6e5c31..3400b9c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.checksum @@ -1 +1 @@ -2916a7cfa4af4193b5fd041b8daaacdb
\ No newline at end of file +bb7b11d3c376f242ec61c71f3a1f272d
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.png Binary files differindex 63def07..ae0fb4b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.txt index 378ec01..d76192a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/box-shadow/basic-shadows-expected.txt @@ -1,6 +1,6 @@ -layer at (0,0) size 785x697 +layer at (0,0) size 785x687 RenderView at (0,0) size 785x600 -layer at (0,0) size 785x697 +layer at (0,0) size 785x687 RenderBlock {HTML} at (0,0) size 785x676 RenderBody {BODY} at (8,8) size 769x652 RenderBlock (anonymous) at (0,0) size 769x150 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt deleted file mode 100644 index 9c97138..0000000 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt +++ /dev/null @@ -1,28 +0,0 @@ -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Old contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,New contents of frame from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match. - -PASS window.frames.length is 2 -FAIL window.frames[0].frameElement.name should be frame. Threw exception TypeError: Cannot read property 'name' of undefined -FAIL window.frames[1].frameElement.name should be obj. Threw exception TypeError: Cannot read property 'name' of undefined -Loading 'data:text/html,Updated contents of iframe' in iframe... -Loading 'data:text/html,Updated contents of object' in object... -FAIL window.frames[0].location.toString() should be data:text/html,Updated contents of iframe. Threw exception TypeError: Property 'toString' of object #<error> is not a function -FAIL window.frames[1].location.toString() should be data:text/html,Updated contents of object. Threw exception TypeError: Property 'toString' of object #<error> is not a function - diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index a8a9c64..88d340e 100755 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -1491,8 +1491,6 @@ BUG10382 MAC : LayoutTests/transitions/shorthand-border-transitions.html = FAIL BUG10384 MAC : LayoutTests/fast/dom/Window/new-window-opener.html = CRASH TIMEOUT FAIL BUG10384 MAC : LayoutTests/fast/forms/focus2.html = CRASH FAIL -BUG10384 MAC : LayoutTests/fast/dom/HTMLObjectElement/object-as-frame.html = TIMEOUT FAIL PASS - BUG10399 MAC : LayoutTests/fast/encoding/char-encoding-mac.html = FAIL // ----------------------------------------------------------------- @@ -1796,7 +1794,6 @@ BUG9798 WIN DEBUG : LayoutTests/editing/selection/4776665.html = FAIL PASS BUG9798 DEBUG : LayoutTests/svg/custom/path-bad-data.svg = CRASH FAIL BUG9798 LINUX DEBUG : chrome/fast/dom/extensions/interval.html = CRASH FAIL PASS BUG9798 MAC DEBUG : chrome/fast/dom/extensions/interval.html = FAIL PASS -BUG9798 LINUX : LayoutTests/fast/dom/HTMLObjectElement/object-as-frame.html = FAIL PASS BUG9798 LINUX MAC : LayoutTests/http/tests/misc/BOM-override-script.html = TIMEOUT PASS BUG9798 LINUX DEBUG : LayoutTests/svg/text/text-text-07-t.svg = FAIL PASS BUG9798 LINUX : LayoutTests/tables/mozilla/bugs/45621.html = FAIL PASS CRASH @@ -1980,10 +1977,6 @@ BUG12881 WIN LINUX : LayoutTests/fast/forms/isindex-placeholder.html = FAIL BUG12881 WIN LINUX : LayoutTests/fast/borders/border-radius-constraints.html = FAIL BUG12881 WIN LINUX : LayoutTests/fast/borders/border-radius-split-inline.html = FAIL -// WebKit 44202:44252 introduced new failures (old tests) -BUG12882 WIN : LayoutTests/fast/dom/HTMLObjectElement/object-as-frame.html = FAIL -BUG12882 WIN : LayoutTests/fast/box-shadow/basic-shadows.html = FAIL - // WebKit 44286:44342 BUG13174 WIN DEBUG : LayoutTests/transitions/shorthand-border-transitions.html = PASS FAIL |