summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 23:38:26 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-22 23:38:26 +0000
commit7b02e4b81c1c1e185e4826b5ddd12e52020a9f10 (patch)
treeba2eee4f872bf48c6168ff2d2d3be07a4f85003a /webkit
parenteef2e6ce3a8befcd460077222a6e9a0e591027d6 (diff)
downloadchromium_src-7b02e4b81c1c1e185e4826b5ddd12e52020a9f10.zip
chromium_src-7b02e4b81c1c1e185e4826b5ddd12e52020a9f10.tar.gz
chromium_src-7b02e4b81c1c1e185e4826b5ddd12e52020a9f10.tar.bz2
Roll WebKit 103399:103567
TBR=rniwa@chromium.org Review URL: http://codereview.chromium.org/8958019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4cac09c..122c420 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -11,6 +11,5 @@
BUGCR107819 LINUX : http/tests/cache/history-only-cached-subresource-loads-max-age-https.html = MISSING
BUGCR107819 LINUX : http/tests/cache/history-only-cached-subresource-loads.html = MISSING
-// Can be removed after r103270 rolls.
-BUGENNE : fast/repaint/table-cell-collapsed-border.html = IMAGE
-BUGENNE CPU-CG : css2.1/20110323/border-conflict-element-001d.htm = IMAGE
+BUGRNIWA LEOPARD : fast/repaint/text-emphasis-h.html = IMAGE PASS
+BUGRNIWA : media/track/track-cue-rendering.html = TEXT