Fix the GC of workers. When Worker object is GC'ed in the renderer, we need t...

webkit/glue/webworker_impl.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 #include "GenericWorkerTask.h"
 #include "KURL.h"
@@ skipping 99 matching lines @@
     // Note that we have to pass a URL with valid protocol in order to follow
     // the path to do static value initializations.
     WTF::RefPtr<WebCore::SecurityOrigin> origin =
         WebCore::SecurityOrigin::create(WebCore::KURL("http://localhost"));
     origin.release();
   }
 }
 
 WebWorkerImpl::WebWorkerImpl(WebWorkerClient* client)
  : client_(client),
-   web_view_(NULL) {
+   web_view_(NULL),
+   asked_to_terminate_(false) {
   InitializeWebKitStaticValues();
 }
 
 WebWorkerImpl::~WebWorkerImpl() {
   web_view_->Close();
 }
 
 void WebWorkerImpl::PostMessageToWorkerContextTask(
     WebCore::ScriptExecutionContext* context,
     WebWorkerImpl* this_ptr,
@@ skipping 46 matching lines @@
       *this,
       *this);
 
   // Worker initialization means a pending activity.
   reportPendingActivity(true);
 
   worker_thread_->start();
 }
 
 void WebWorkerImpl::terminateWorkerContext() {
+  if (asked_to_terminate_)
+    return;
+  asked_to_terminate_ = true;
+
   if (worker_thread_)
     worker_thread_->stop();
 }
 
 void WebWorkerImpl::postMessageToWorkerContext(const WebString& message) {
   worker_thread_->runLoop().postTask(WebCore::createCallbackTask(
       &PostMessageToWorkerContextTask,
       this,
       webkit_glue::WebStringToString(message)));
 }
 
 void WebWorkerImpl::workerObjectDestroyed() {
+  // Worker object in the renderer was destroyed, perhaps a result of GC.
+  // For us, it's a signal to start terminating the WorkerContext too.
+  // TODO(dimich): when 'kill a worker' html5 spec algorithm is implemented, it
+  // should be used here instead of 'terminate a worker'.
+  terminateWorkerContext();
 }
 
 void WebWorkerImpl::DispatchTaskToMainThread(
     PassRefPtr<WebCore::ScriptExecutionContext::Task> task) {
   return WTF::callOnMainThread(InvokeTaskMethod, task.releaseRef());
 }
 
 void WebWorkerImpl::InvokeTaskMethod(void* param) {
   WebCore::ScriptExecutionContext::Task* task =
       static_cast<WebCore::ScriptExecutionContext::Task*>(param);
@@ skipping 139 matching lines @@
 
 namespace WebKit {
 
 WebWorker* WebWorker::create(WebWorkerClient* client) {
   return NULL;
 }
 
 }
 
 #endif