summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpaul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-22 18:45:31 +0000
committerpaul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-22 18:45:31 +0000
commit7be90a224c24e5cb01786c15917e5c4819aae267 (patch)
tree4fb16a54006807893ab77a25598088c58615d203 /webkit
parentf006e5759e8e2631b951e0f9e7d696f2f7777728 (diff)
downloadchromium_src-7be90a224c24e5cb01786c15917e5c4819aae267.zip
chromium_src-7be90a224c24e5cb01786c15917e5c4819aae267.tar.gz
chromium_src-7be90a224c24e5cb01786c15917e5c4819aae267.tar.bz2
WebKit merge 48585:48610.
BUG=None. TEST=Covered by layout tests. Review URL: http://codereview.chromium.org/212042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6ff1b28..77ed886 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -114,6 +114,7 @@ WONTFIX SKIP BUG19635 : LayoutTests/fast/dom/Window/timer-resume-on-navigation-b
// Depends on page cache, as far as I can tell.
WONTFIX SKIP BUG19635 : LayoutTests/fast/events/pageshow-pagehide-on-back-cached.html = TIMEOUT FAIL
WONTFIX SKIP BUG19635 : LayoutTests/fast/events/pageshow-pagehide-on-back-cached-with-frames.html = TIMEOUT
+WONTFIX SKIP BUG19635 : LayoutTests/media/restore-from-page-cache.html = TIMEOUT
// No support for WebGL yet
BUG21852 SKIP : LayoutTests/fast/canvas/webgl = FAIL
@@ -2196,7 +2197,6 @@ BUG18939 : LayoutTests/fast/js/prototypes.html = FAIL
// Fallout from webkit 47041:47189
BUG19248 : LayoutTests/fast/js/const.html = FAIL
BUG22296 : LayoutTests/storage/multiple-transactions-on-different-handles.html = TIMEOUT
-BUG22299 : LayoutTests/fast/dom/Window/window-property-shadowing.html = FAIL
BUG_LEVIN WIN : LayoutTests/fast/events/mouse-click-events.html = FAIL