summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-14 17:07:06 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-14 17:07:06 +0000
commitdd44605855c69564f7b42c08e5deed755e1ccbad (patch)
tree869d06d9c137b653403f81aef3579923858ec52c /webkit
parent90ba25538240fac3cf3de245c0ce94dff754f406 (diff)
downloadchromium_src-dd44605855c69564f7b42c08e5deed755e1ccbad.zip
chromium_src-dd44605855c69564f7b42c08e5deed755e1ccbad.tar.gz
chromium_src-dd44605855c69564f7b42c08e5deed755e1ccbad.tar.bz2
Webkit merge 39829:39880, chromium portion
Review URL: http://codereview.chromium.org/18048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index a59f2dd..032332a 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1927,6 +1927,14 @@ LINUX : LayoutTests/svg/custom/viewbox-syntax.svg = FAIL
LINUX : chrome/fonts/courier.html = FAIL
-
// TODO(mmoss): rebaseline this when patterns are drawn correctly.
LINUX WIN : LayoutTests/svg/W3C-SVG-1.1/pservers-grad-06-b.svg = FAIL
+
+// Merge 39830:39880 - new tests
+LayoutTests/plugins/npruntime.html = TIMEOUT
+
+// Merge 39830:39880 - regressions
+LayoutTests/editing/selection/5057506.html = FAIL
+LINUX WIN : LayoutTests/fast/events/init-events.html = FAIL
+
+