summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 20:27:05 +0000
committersenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 20:27:05 +0000
commit4d98e0464e93befc1ac7f150eee3dece95d30675 (patch)
tree48b3bab731ba214bb5f5e6eab1d592e6ddc9120c
parentdef77b9b4ff4ca77f0961f72b69e4e38e1d09bac (diff)
downloadchromium_src-4d98e0464e93befc1ac7f150eee3dece95d30675.zip
chromium_src-4d98e0464e93befc1ac7f150eee3dece95d30675.tar.gz
chromium_src-4d98e0464e93befc1ac7f150eee3dece95d30675.tar.bz2
Roll DEPS for WebKit 50454:50468.
BUG=none TEST=none TBR=hclam Review URL: http://codereview.chromium.org/342102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30856 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 7fb4794..95cb593 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "50454",
+ "webkit_revision": "50468",
"ffmpeg_revision": "30374",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5680962..3e44cef 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3270,7 +3270,7 @@ BUG9798 WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement01.html = PASS T
// Flaky since at least WebKit 50258.
BUG9798 WIN DEBUG : LayoutTests/media/video-empty-source.html = IMAGE PASS
-BUG9798 WIN MAC RELEASE : LayoutTests/fast/dom/defaultView.html = TEXT PASS
+BUG9798 WIN MAC : LayoutTests/fast/dom/defaultView.html = TEXT PASS
BUG9798 WIN RELEASE : LayoutTests/http/tests/navigation/no-referrer-reset.html = TIMEOUT PASS
// Turned flaky at WebKit 50325:50358