summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-14 03:42:36 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-14 03:42:36 +0000
commit0550f53f65e7efa9ec244a5c60951a984afbb504 (patch)
tree153a078291d2e0c2e1272c9d20f7514b672d56b7 /webkit
parentc690ff68f65729ee90b47fb9646ee302053d7824 (diff)
downloadchromium_src-0550f53f65e7efa9ec244a5c60951a984afbb504.zip
chromium_src-0550f53f65e7efa9ec244a5c60951a984afbb504.tar.gz
chromium_src-0550f53f65e7efa9ec244a5c60951a984afbb504.tar.bz2
WebKit merge 50947:50972
TEST=none BUG=none Review URL: http://codereview.chromium.org/384135 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
1 files changed, 6 insertions, 0 deletions
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