summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 12:02:19 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 12:02:19 +0000
commitf4944353d0156fcf18844d180b2f5a72611a337b (patch)
tree8c9dec57608557b7120cbfdd26825eda4afe74e8
parent352104ee28f47810b5d2dc5fd6193c60d2cd2e95 (diff)
downloadchromium_src-f4944353d0156fcf18844d180b2f5a72611a337b.zip
chromium_src-f4944353d0156fcf18844d180b2f5a72611a337b.tar.gz
chromium_src-f4944353d0156fcf18844d180b2f5a72611a337b.tar.bz2
Revert "WebKit roll to 55572"
This is a speculative fix for page cycler regressions. This reverts commit 7f33868ce04ed5679e8dd3e3d9ca57d47177cfbc / 40730 TEST=none BUG=none Review URL: http://codereview.chromium.org/668152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40733 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--chrome/worker/worker_uitest.cc4
2 files changed, 2 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index c174d5c..a6c2c13 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "55572",
+ "webkit_revision": "55512",
"ffmpeg_revision": "40586",
"skia_revision": "504",
"chromium_git": "http://src.chromium.org/git",
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 780cb6d..7e4eb2e 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -246,9 +246,7 @@ TEST_F(WorkerTest, WorkerLocation) {
TEST_F(WorkerTest, WorkerMessagePort) {
RunWorkerFastLayoutTest("worker-messageport.html");
}
-
-// http://crbug.com/37499.
-TEST_F(WorkerTest, DISABLED_WorkerMessagePortGC) {
+TEST_F(WorkerTest, WorkerMessagePortGC) {
RunWorkerFastLayoutTest("worker-messageport-gc.html");
}
TEST_F(WorkerTest, WorkerMultiPort) {