diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 23:07:42 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-23 23:07:42 +0000 |
| commit | 355276d8ef4f0582ecfbb91d947a5c8f2057774a (patch) | |
| tree | 2f72c004796a4bdfdce88cb39b0518f0ca39e40f | |
| parent | 581b87eb99683237b52cf727178c0492cf273eeb (diff) | |
| download | chromium_src-355276d8ef4f0582ecfbb91d947a5c8f2057774a.zip chromium_src-355276d8ef4f0582ecfbb91d947a5c8f2057774a.tar.gz chromium_src-355276d8ef4f0582ecfbb91d947a5c8f2057774a.tar.bz2 | |
Update WebKit from 46282 to 46288.
TBR=pkasting
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/160057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21467 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "46282", + "webkit_revision": "46288", } diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index e11d4e5..76cea01 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2967,10 +2967,6 @@ BUG17170 : LayoutTests/fast/dom/prototype-inheritance.html = FAIL BUG17255 LINUX WIN : LayoutTests/fast/box-shadow/spread.html = FAIL BUG13907 WIN : LayoutTests/media/audio-constructor-autobuffer.html = FAIL -// New test from WebKit merge 46126:46141 (crashes on mac). -BUG17321 LINUX : LayoutTests/fast/loader/non-html-load-event.html = FAIL -BUG17321 MAC : LayoutTests/fast/loader/non-html-load-event.html = CRASH FAIL - // Test failures from WebKit merge r46143:46194 BUG17397 SKIP WIN : LayoutTests/media/audio-no-installed-engines.html = FAIL BUG17398 LINUX : LayoutTests/fast/borders/borderRadiusDashed02.html = FAIL @@ -2997,3 +2993,8 @@ BUG17589 WIN LINUX : LayoutTests/fast/forms/select-popup-pagekeys.html = FAIL // These need new baselines for the merge r46270:46282. BUG_DARIN WIN LINUX : LayoutTests/fast/overflow/overflow-with-local-background-attachment.html = FAIL + +// These need new baselines for the merge r46282:46288. +BUG_DARIN WIN LINUX : LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html = FAIL +BUG_DARIN WIN LINUX : LayoutTests/fast/css/getComputedStyle/computed-style.html = FAIL +BUG_DARIN WIN LINUX : LayoutTests/svg/css/getComputedStyle-basic.xhtml = FAIL |