From 19e9aad1795387d97f0ab6849321a2c0f95ef49b Mon Sep 17 00:00:00 2001 From: "yutak@chromium.org" Date: Tue, 16 Mar 2010 05:08:10 +0000 Subject: WebKit merge 56004:56026. BUG=none TEST=none TBR=jianli Review URL: http://codereview.chromium.org/1000003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41680 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/layout_tests/test_expectations.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'webkit/tools') diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 6540cca..8c87da0 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2832,3 +2832,7 @@ BUG38227 DEFER : fast/dom/HTMLProgressElement/progress-element.html = MISSING BUG38227 DEFER : fast/dom/HTMLProgressElement/set-progress-properties.html = MISSING BUG_JIANLI MAC : printing/return-from-printing-mode.html = IMAGE + +// WebKit roll 56004 -> 56026 +BUG_JIANLI : fast/events/continuous-platform-wheelevent-in-scrolling-div.html = TIMEOUT +BUG_JIANLI : fast/events/platform-wheelevent-in-scrolling-div.html = TIMEOUT -- cgit v1.1