diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "59900", + "webkit_revision": "59937", "ffmpeg_revision": "47712", "skia_revision": "562", "chromium_git": "http://src.chromium.org/git", diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 8ada3f2..c3496e0 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -418,6 +418,12 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) { StopHttpServer(); } +// http://crbug.com/40995 +// https://bugs.webkit.org/show_bug.cgi?id=37518 +#if defined(OS_WIN) +#define WorkerWebSocketLayoutTests FAILS_WorkerWebSocketLayoutTests +#endif + TEST_F(WorkerTest, WorkerWebSocketLayoutTests) { static const char* kLayoutTestFiles[] = { "worker-simple.html", |