summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 21:51:07 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 21:51:07 +0000
commit001e4eeda9ae3d823ceb601ba993cf67d81d864a (patch)
treeee878480b712ae7483b35f319a35c4bb4f5a7973 /webkit
parent88791a8ce288cf80530911c7aae663cf71f84961 (diff)
downloadchromium_src-001e4eeda9ae3d823ceb601ba993cf67d81d864a.zip
chromium_src-001e4eeda9ae3d823ceb601ba993cf67d81d864a.tar.gz
chromium_src-001e4eeda9ae3d823ceb601ba993cf67d81d864a.tar.bz2
Roll Webkit 51772 -> 51784.
Updated test expectations. TBR=michaeln@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/464063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt11
1 files changed, 9 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index f46a13e..c81b9a2 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3079,7 +3079,6 @@ BUG_29393 : LayoutTests/fast/loader/stateobjects/replacestate-then-pushstate.htm
BUG_ATWILSON : LayoutTests/accessibility/aria-scrollbar-role.html = TEXT
BUG_ATWILSON : LayoutTests/http/tests/security/cross-frame-access-enumeration.html = TEXT
-BUG_ATWILSON LINUX WIN : LayoutTests/fast/repaint/block-selection-gap-in-composited-layer.html = IMAGE+TEXT
BUG_ATWILSON : LayoutTests/fast/repaint/selection-gap-overflow-scroll.html = IMAGE
// Failures introduced by USE_NEW_BUILDER in Skia.
@@ -3120,5 +3119,13 @@ BUG_AJWONG : LayoutTests/tables/mozilla/bugs/bug15933.html = IMAGE PASS
BUG_AJWONG WIN : chrome/fast/forms/basic-selects.html = IMAGE
BUG_AJWONG WIN :LayoutTests/fast/body-propagation/overflow/004-xhtml.xhtml = IMAGE+TEXT PASS
-// Failres from Webkit merger 51724 -> 51772
+// Failures from Webkit merger 51724 -> 51772
BUG_AJWONG: LayoutTests/http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html = TEXT
+
+// Regression from Webkit merge r51776
+BUG_AJWONG : LayoutTests/fast/repaint/block-selection-gap-stale-cache-2.html = IMAGE IMAGE+TEXT
+BUG_AJWONG : LayoutTests/fast/repaint/block-selection-gap-stale-cache.html = IMAGE IMAGE+TEXT
+
+// Regression from Webkit merge 51772 -> 51784
+BUG_AJWONG : LayoutTests/storage/domstorage/quota.html = CRASH
+BUG_AJWONG : LayoutTests/http/tests/appcache/resource-redirect-2.html = TIMEOUT