diff options
| author | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 05:08:10 +0000 |
|---|---|---|
| committer | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 05:08:10 +0000 |
| commit | 19e9aad1795387d97f0ab6849321a2c0f95ef49b (patch) | |
| tree | 9668ce5b99324de72531dcef751f5689c652a17a /webkit/tools | |
| parent | 8351fb10c903690cdb2c225eadb1da4a7466c2fa (diff) | |
| download | chromium_src-19e9aad1795387d97f0ab6849321a2c0f95ef49b.zip chromium_src-19e9aad1795387d97f0ab6849321a2c0f95ef49b.tar.gz chromium_src-19e9aad1795387d97f0ab6849321a2c0f95ef49b.tar.bz2 | |
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
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 4 |
1 files changed, 4 insertions, 0 deletions
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 |