summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 02:53:16 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 02:53:16 +0000
commit9e4d24a6163e7ac45aae43be26180e8cf0bb61e3 (patch)
treef4593b1be73227872405aa527be85a24c39f0e8a
parentb252972a2c680149da1f2c77768c3eea4bee6823 (diff)
downloadchromium_src-9e4d24a6163e7ac45aae43be26180e8cf0bb61e3.zip
chromium_src-9e4d24a6163e7ac45aae43be26180e8cf0bb61e3.tar.gz
chromium_src-9e4d24a6163e7ac45aae43be26180e8cf0bb61e3.tar.bz2
WebKit roll 72952:72986. Also cleaned up downstream test_expectations.txt file.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67807 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt24
2 files changed, 4 insertions, 22 deletions
diff --git a/DEPS b/DEPS
index 0b3c3b5..d4d6981 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "72952",
+ "webkit_revision": "72986",
"skia_revision": "626",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "40423",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 79bb2b8..0c98d06 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -5,33 +5,15 @@
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
-BUG_LEVIN WIN : fast/xsl/xslt-mismatched-tags-in-xslt.xml = IMAGE PASS
+BUG_LEVIN WIN : fast/xsl/xslt-mismatched-tags-in-xslt.xml = IMAGE
// Not sure when this started crashing, seen on my webkit roll, but was crashing before that.
-BUG_JPARENT SLOW LINUX : fast/dom/HTMLHeadElement/head-check.html = CRASH PASS
-
-// Debug only timeout, so no coverage from canaries, somewhere in range 72395:72417.
-BUG_JPARENT WIN DEBUG : inspector/styles-disable-then-delete.html = TIMEOUT
+BUG_JPARENT LINUX : fast/dom/HTMLHeadElement/head-check.html = CRASH PASS
// Started to flake since http://src.chromium.org/viewvc/chrome?view=rev&revision=66937
// (72440; 72514] range
-BUG_ANTON LINUX DEBUG : fast/ruby/nested-ruby.html = CRASH PASS
+BUG_ANTON LINUX : fast/ruby/nested-ruby.html = CRASH PASS
// Rebaseline tool wasn't working for these tests.
BUG64394 MAC : svg/W3C-SVG-1.1/struct-image-10-t.svg = IMAGE
BUG64395 MAC : tables/mozilla/bugs/bug14929.html = IMAGE
-
-BUG_THAKIS MAC : fast/repaint/block-layout-inline-children-replaced.html = IMAGE PASS
-
-// Need rebaseline.
-BUG_KINUKO : fast/filesystem/read-directory.html = TEXT
-BUG_KINUKO : fast/filesystem/simple-persistent.html = TEXT
-BUG_KINUKO : fast/filesystem/simple-temporary.html = TEXT
-
-BUG_LOISLO WIN RELEASE : http/tests/appcache/online-whitelist.html = TEXT
-BUGWK46940 WIN RELEASE : fast/dom/Window/window-screen-properties.html = TEXT
-
-BUG_OJAN WONTFIX SKIP : fast/spatial-navigation = FAIL
-BUG_OJAN MAC : fast/block/basic/truncation-rtl.html = IMAGE+TEXT
-
-BUG_VITALYR MAC : fast/filesystem/async-operations.html = CRASH PASS TEXT