summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 18:16:28 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 18:16:28 +0000
commit1476ac546bc4be566f019e21580bb377d9945930 (patch)
tree5bc03b5a338b01f62538f79461383e5adc47d24d
parent83e45ed8b9b14dc54ecafd5a8c70e048bc57b967 (diff)
downloadchromium_src-1476ac546bc4be566f019e21580bb377d9945930.zip
chromium_src-1476ac546bc4be566f019e21580bb377d9945930.tar.gz
chromium_src-1476ac546bc4be566f019e21580bb377d9945930.tar.bz2
Roll the WebKit deps 47770:47779TBR=ojanBUG=20319TEST=none
Review URL: http://codereview.chromium.org/174531 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24477 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
2 files changed, 5 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 1f4004a..57e3adc 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "47770",
+ "webkit_revision": "47779",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a5716da..5fe337f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2823,5 +2823,8 @@ BUG20265 LINUX : LayoutTests/platform/mac/accessibility/slider-supports-actions.
BUG20292 : LayoutTests/fast/forms/input-list.html = FAIL
BUG20292 : LayoutTests/fast/forms/input-selectedoption.html = FAIL
+// WebKit 47770:47779
+BUG20319 : LayoutTests/fast/dom/Window/timer-resume-on-navigation-back.html = TIMEOUT
+
// Fails after V8 rollup
-BUG20314 MAC : LayoutTests/fast/css/only-of-type-pseudo-class.html = FAIL \ No newline at end of file
+BUG20314 MAC : LayoutTests/fast/css/only-of-type-pseudo-class.html = FAIL