diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 01:36:48 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 01:36:48 +0000 |
| commit | 57d0ff6dfceeb1a273acc9becd34055031700d8a (patch) | |
| tree | 7d8903b773de764414dfb1b87ec5abca86d3b109 | |
| parent | 8a304130d6d53bae89ae6023e64b261624ed5ddf (diff) | |
| download | chromium_src-57d0ff6dfceeb1a273acc9becd34055031700d8a.zip chromium_src-57d0ff6dfceeb1a273acc9becd34055031700d8a.tar.gz chromium_src-57d0ff6dfceeb1a273acc9becd34055031700d8a.tar.bz2 | |
WebKit merge 55791:55819
BUG=none
TEST=none
TBR=jianli
Review URL: http://codereview.chromium.org/795005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41234 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 12 |
2 files changed, 13 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "55791", + "webkit_revision": "55819", "ffmpeg_revision": "40718", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index c5557c2..99d8719 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2913,3 +2913,15 @@ BUG37869 LINUX : fast/images/animated-svg-as-image.html = IMAGE BUG37869 MAC LINUX : inspector/timeline-network-resource.html = CRASH BUG37869 MAC : fast/canvas/webgl/uniform-location.html = TEXT BUG37869 MAC : editing/input/option-page-up-down.html = TIMEOUT + +// WebKit merge 55791:55819 +BUG_JAPHET MAC : fast/canvas/webgl/uniform-location.html = TEXT +BUG_JAPHET MAC : fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT +BUG_JAPHET MAC : fast/css/getComputedStyle/computed-style.html = TEXT +BUG_JAPHET MAC : fast/dom/Window/window-appendages-cleared.html = TEXT +BUG_JAPHET : fast/events/spatial-navigation/snav-fully-aligned-horizontally.html = TEXT +BUG_JAPHET : fast/events/spatial-navigation/snav-fully-aligned-vertically.html = TEXT +BUG_JAPHET : fast/events/spatial-navigation/snav-iframe-no-focusable-content.html = TEXT +BUG_JAPHET : fast/events/spatial-navigation/snav-iframe-no-scrollable-content.html = TEXT +BUG_JAPHET : fast/events/spatial-navigation/snav-iframe-with-offscreen-focusable-element.html = TEXT +BUG_JAPHET : fast/events/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html = TEXT |