summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 23:48:21 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 23:48:21 +0000
commit62311edabde1105ca4231a220521951553cf3e19 (patch)
treefc15c7d3b389411892670e6a8ffcb5fff96b2f40
parentdd8df4c59c6582376212f2c8aa4b9f5e4307b265 (diff)
downloadchromium_src-62311edabde1105ca4231a220521951553cf3e19.zip
chromium_src-62311edabde1105ca4231a220521951553cf3e19.tar.gz
chromium_src-62311edabde1105ca4231a220521951553cf3e19.tar.bz2
Roll deps from 51784 -> 51794.
TBR=michaeln BUG=none TEST=none Review URL: http://codereview.chromium.org/469015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34017 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 23eed69..057797e 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "51784",
+ "webkit_revision": "51794",
"ffmpeg_revision": "33521",
"skia_revision": "451",
"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 c7cf951..9edb068 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2981,7 +2981,7 @@ BUG_OJAN LINUX DEBUG : LayoutTests/http/tests/navigation/lockedhistory-iframe.ht
// These tests time out *and* are slow. The test should be fixed to not timeout,
// then should be marked as SLOW/PASS.
BUG2844 : LayoutTests/http/tests/appcache/cyrillic-uri.html = TIMEOUT PASS
-BUG2844 : LayoutTests/http/tests/appcache/fail-on-update.html = TIMEOUT PASS
+BUG2844 : LayoutTests/http/tests/appcache/fail-on-update.html = TIMEOUT PASS TEXT
BUG2844 : LayoutTests/http/tests/appcache/offline-access.html = TIMEOUT PASS
BUG2844 LINUX: LayoutTests/http/tests/appcache/remove-cache.html = TIMEOUT PASS
BUG2844 WIN RELEASE : LayoutTests/http/tests/appcache/remove-cache.html = TIMEOUT PASS