diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 20:50:03 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 20:50:03 +0000 |
| commit | 1af63e47dd6ea5a4d4db5cf679ebe6e01fd2f45b (patch) | |
| tree | 3a12c3a8afb7a3fcf6b73e351319ec4e796fadf0 | |
| parent | c6980ea5692e31581fe2f65c6ee2a5a9547145f2 (diff) | |
| download | chromium_src-1af63e47dd6ea5a4d4db5cf679ebe6e01fd2f45b.zip chromium_src-1af63e47dd6ea5a4d4db5cf679ebe6e01fd2f45b.tar.gz chromium_src-1af63e47dd6ea5a4d4db5cf679ebe6e01fd2f45b.tar.bz2 | |
WebKit merge 56312:56350 (disables a work test due to http://trac.webkit.org/changeset/56329)
BUG=38918
TEST=none
TBR=ajwong
Review URL: http://codereview.chromium.org/1098008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42251 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "56312", + "webkit_revision": "56350", "ffmpeg_revision": "42082", "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 065ae87..69906c4 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -268,7 +268,8 @@ TEST_F(WorkerTest, WorkerReplaceSelf) { RunWorkerFastLayoutTest("worker-replace-self.html"); } -TEST_F(WorkerTest, WorkerScriptError) { +// http://crbug.com/38918 +TEST_F(WorkerTest, DISABLED_WorkerScriptError) { RunWorkerFastLayoutTest("worker-script-error.html"); } |