summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests
diff options
context:
space:
mode:
authoryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 20:25:52 +0000
committeryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 20:25:52 +0000
commit2e14ff17f615ba33a778b95370084073a86ff226 (patch)
tree5298af8c5c2bc66e9fb30b79c6a1535baa80152c /webkit/tools/layout_tests
parentd623ba1299f983cdcf8b2c57ba61715cb84102c1 (diff)
downloadchromium_src-2e14ff17f615ba33a778b95370084073a86ff226.zip
chromium_src-2e14ff17f615ba33a778b95370084073a86ff226.tar.gz
chromium_src-2e14ff17f615ba33a778b95370084073a86ff226.tar.bz2
Rolling webkit 50972:51042.
Review URL: http://codereview.chromium.org/399005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 85d74b3..256c918 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3090,3 +3090,11 @@ BUG27679 WIN LINUX MAC : LayoutTests/fast/events/ime-composition-events-001.html
// Failure from merge 50947:50972
BUG27683 : LayoutTests/svg/custom/viewport-update2.svg = IMAGE+TEXT
+
+// Failures from merge 50972:51042
+BUGYAAR : LayoutTests/editing/selection/4960116.html = IMAGE
+BUGYAAR : LayoutTests/fast/css/apple-prefix.html = IMAGE
+BUGYAAR : LayoutTests/fast/repaint/fixed.html = IMAGE
+BUGYAAR : LayoutTests/fast/overflow/line-clamp.html = IMAGE+TEXT
+BUG27850 : LayoutTests/fast/history/back-forward-reset-after-error-handling.html = TEXT
+BUG27849 : LayoutTests/http/tests/security/isolatedWorld/didClearWindowObject.html = TEXT