diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "50947", + "webkit_revision": "50972", "ffmpeg_revision": "30374", } diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 76177cc..a184b45 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3100,3 +3100,9 @@ BUG27555 : LayoutTests/media/media-fullscreen-not-in-document.html = TIMEOUT BUG27555 WIN LINUX : LayoutTests/fast/canvas/canvas-shadow.html = TEXT BUG27555 WIN LINUX : LayoutTests/fast/multicol/single-line.html = IMAGE+TEXT + +// hbono's new test. +BUG27679 WIN LINUX MAC : LayoutTests/fast/events/ime-composition-events-001.html = TEXT + +// Failure from merge 50947:50972 +BUG27683 : LayoutTests/svg/custom/viewport-update2.svg = IMAGE+TEXT |