summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 22:49:22 +0000
committeryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 22:49:22 +0000
commit609d0783be4f7bb1def72d32be4715aefed83430 (patch)
tree2453d1c114292d5ded01cb1be9faf087367035a4
parent74d95ead1392e952768e659d156ccceb9ef2c792 (diff)
downloadchromium_src-609d0783be4f7bb1def72d32be4715aefed83430.zip
chromium_src-609d0783be4f7bb1def72d32be4715aefed83430.tar.gz
chromium_src-609d0783be4f7bb1def72d32be4715aefed83430.tar.bz2
WebKit Roll 53314:53340
Review URL: http://codereview.chromium.org/553003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36430 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
2 files changed, 7 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 5881dea..882a1504 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "53313",
+ "webkit_revision": "53340",
"ffmpeg_revision": "34297",
"skia_revision": "474",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 2106b03..4f9cca0 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2884,7 +2884,7 @@ BUG30343 LINUX : fast/css/large-number-round-trip.html = TEXT
// Likely, moving Windows to using Apache2 will fix this as the Linux/Mac builds
// did not get flaky here and moving to Apache made the appcache tests less
// flaky on those platforms.
-BUG25977 WIN DEBUG : http/tests/appcache/access-via-redirect.php = TIMEOUT PASS
+BUG25977 WIN DEBUG : http/tests/appcache/access-via-redirect.php = TIMEOUT PASS FAIL
BUG25977 WIN DEBUG : http/tests/appcache/auth.html = TIMEOUT PASS
BUG25977 WIN DEBUG : http/tests/appcache/crash-when-navigating-away-then-back.html = TIMEOUT PASS
BUG25977 WIN DEBUG : http/tests/appcache/different-scheme.html = TIMEOUT PASS
@@ -3013,3 +3013,8 @@ BUG32305 : fast/loader/onload-willSendRequest-null-for-script.html = TEXT
// New flakyness ?
BUG32306 MAC DEBUG: svg/hixie/error/004.xml = CRASH PASS
+
+// WebKit roll: 53314:53340
+BUG53331 MAC : fast/gradients/simple-gradients.html = FAIL
+BUG53331 MAC : fast/gradients/border-image-gradient.html = FAIL
+BUG53331 : fast/gradients/border-image-gradient-sides-and-corners.html = FAIL