summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 23:56:25 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 23:56:25 +0000
commit98c2b16db508ecbdf0398a78cf68cf4dc938d697 (patch)
treee5226da75cc84069eb9fe58bdd05721eb1302985 /webkit/tools
parente05dc976d11208e13a180cfb149b3db4a65f9f1a (diff)
downloadchromium_src-98c2b16db508ecbdf0398a78cf68cf4dc938d697.zip
chromium_src-98c2b16db508ecbdf0398a78cf68cf4dc938d697.tar.gz
chromium_src-98c2b16db508ecbdf0398a78cf68cf4dc938d697.tar.bz2
WebKit merge 50932:50947.
This also includes http://codereview.chromium.org/394008 which restores interactive tests for devtools. TEST=none BUG=none Review URL: http://codereview.chromium.org/386029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7ae820d..090f6ae 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3131,4 +3131,3 @@ 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
-