Roll DEPS for WebKit 50416:50432. Includes a fix for upstream worker breakage, courtesy of dimich.

BUG=none
TEST=none
TBR=hclam

Review URL: http://codereview.chromium.org/341077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30791 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 10 deletions

diff --git a/DEPS b/DEPS
index 223d76c..6e0930b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "50416",
+  "webkit_revision": "50432",
   "ffmpeg_revision": "30374",
 }
 
diff --git a/webkit/api/src/WebWorkerImpl.cpp b/webkit/api/src/WebWorkerImpl.cpp
index 4028b71..77eb73c 100644
--- a/webkit/api/src/WebWorkerImpl.cpp
+++ b/webkit/api/src/WebWorkerImpl.cpp
@@ -216,9 +216,9 @@ void WebWorkerImpl::clientDestroyed()
     m_client = 0;
 }
 
-void WebWorkerImpl::dispatchTaskToMainThread(PassRefPtr<ScriptExecutionContext::Task> task)
+void WebWorkerImpl::dispatchTaskToMainThread(PassOwnPtr<ScriptExecutionContext::Task> task)
 {
-    return callOnMainThread(invokeTaskMethod, task.releaseRef());
+    return callOnMainThread(invokeTaskMethod, task.release());
 }
 
 void WebWorkerImpl::invokeTaskMethod(void* param)
@@ -226,7 +226,7 @@ void WebWorkerImpl::invokeTaskMethod(void* param)
     ScriptExecutionContext::Task* task =
         static_cast<ScriptExecutionContext::Task*>(param);
     task->performTask(0);
-    task->deref();
+    delete task;
 }
 
 // WorkerObjectProxy -----------------------------------------------------------
@@ -346,14 +346,14 @@ void WebWorkerImpl::workerContextDestroyed()
 
 // WorkerLoaderProxy -----------------------------------------------------------
 
-void WebWorkerImpl::postTaskToLoader(PassRefPtr<ScriptExecutionContext::Task> task)
+void WebWorkerImpl::postTaskToLoader(PassOwnPtr<ScriptExecutionContext::Task> task)
 {
     ASSERT(m_loadingDocument->isDocument());
     m_loadingDocument->postTask(task);
 }
 
 void WebWorkerImpl::postTaskForModeToWorkerContext(
-    PassRefPtr<ScriptExecutionContext::Task> task, const String& mode)
+    PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
 {
     m_workerThread->runLoop().postTaskForMode(task, mode);
 }
diff --git a/webkit/api/src/WebWorkerImpl.h b/webkit/api/src/WebWorkerImpl.h
index 00024f2..49215593 100644
--- a/webkit/api/src/WebWorkerImpl.h
+++ b/webkit/api/src/WebWorkerImpl.h
@@ -73,9 +73,9 @@ public:
     virtual void workerContextDestroyed();
 
     // WebCore::WorkerLoaderProxy methods:
-    virtual void postTaskToLoader(PassRefPtr<WebCore::ScriptExecutionContext::Task>);
+    virtual void postTaskToLoader(PassOwnPtr<WebCore::ScriptExecutionContext::Task>);
     virtual void postTaskForModeToWorkerContext(
-        PassRefPtr<WebCore::ScriptExecutionContext::Task>, const WebCore::String& mode);
+        PassOwnPtr<WebCore::ScriptExecutionContext::Task>, const WebCore::String& mode);
 
     // WebWorker methods:
     virtual void startWorkerContext(const WebURL&, const WebString&, const WebString&);
@@ -87,7 +87,7 @@ public:
     WebWorkerClient* client() {return m_client;}
 
     // Executes the given task on the main thread.
-    static void dispatchTaskToMainThread(PassRefPtr<WebCore::ScriptExecutionContext::Task>);
+    static void dispatchTaskToMainThread(PassOwnPtr<WebCore::ScriptExecutionContext::Task>);
 
 private:
     virtual ~WebWorkerImpl();
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 453e453..158bda6 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3191,7 +3191,7 @@ BUG_JORLOW WIN : chrome/fast/forms/basic-selects.html = IMAGE
 // WebKit roll 50248:50258
 BUG26195 : LayoutTests/accessibility/aria-option-role.html = TEXT
 BUG26195 LINUX : LayoutTests/fast/forms/select-empty-option-height.html = PASS TIMEOUT
-BUG26195 LINUX : LayoutTests/svg/custom/marker-default-width-height.svg = TEXT
+BUG26195 LINUX MAC : LayoutTests/svg/custom/marker-default-width-height.svg = TEXT
 BUG26195 LINUX RELEASE : LayoutTests/fast/overflow/overflow_hidden.html = PASS CRASH
 BUG26195 MAC : LayoutTests/css3/css3-modsel-33.html = TEXT
 BUG26195 MAC : chrome/plugins/script-object-invoke.html = TEXT