Oilpan: move WorkerGlobalScope to oilpan's heap.

Source/core/workers/WorkerGlobalScope.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 38 matching lines @@
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerLocation.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
 #include "core/workers/WorkerThread.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 namespace WebCore {
 
 class CloseWorkerGlobalScopeTask : public ExecutionContextTask {

[haraken, 2014/02/27 02:46:01]

Now that we call WorkerGlobalScope::detach() when shutting down the worker
thread, would it be possible to remove CloseWorkerGlobalScopeTask ?

BTW, before your CL, why did we need to clear WorkerGlobalScope asynchronously
using CloseWorkerGlobalScopeTask? Is it OK to replace the asynchronous clean-up
with the synchronous clean-up in your CL? (In your CL, the clean-up is done
synchronously by calling WorkerGlobalScope::detach().)

[sof, 2014/02/27 08:50:37]

This is to handled script-initiated closing (via close()), which isn't an abrupt
operation. I don't see a significant overlap with a final detach operation; not
touching that logic & code here.

[haraken, 2014/02/27 09:07:20]

Thanks for the clarification. Keeping the CloseWorkerGlobalScopeTask  won't
cause any conflict with the detach operation.

 public:
     static PassOwnPtr<CloseWorkerGlobalScopeTask> create()
     {
         return adoptPtr(new CloseWorkerGlobalScopeTask);
     }
 
     virtual void performTask(ExecutionContext *context)
     {
         WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
         // Notify parent that this context is closed. Parent is responsible for calling WorkerThread::stop().
@@ skipping 15 matching lines @@
     , m_timeOrigin(timeOrigin)
 {
     ScriptWrappable::init(this);
     setClient(this);
     setSecurityOrigin(SecurityOrigin::create(url));
     m_workerClients->reattachThread();
 }
 
 WorkerGlobalScope::~WorkerGlobalScope()
 {
-    ASSERT(thread()->isCurrentThread());
-
-    // Notify proxy that we are going away. This can free the WorkerThread object, so do not access it after this.
-    thread()->workerReportingProxy().workerGlobalScopeDestroyed();
-
-    setClient(0);
+    ASSERT(!m_thread);
 }
 
 void WorkerGlobalScope::applyContentSecurityPolicyFromString(const String& policy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
 {
     setContentSecurityPolicy(ContentSecurityPolicy::create(this));
     contentSecurityPolicy()->didReceiveHeader(policy, contentSecurityPolicyType, ContentSecurityPolicy::HeaderSourceHTTP);
 }
 
 ExecutionContext* WorkerGlobalScope::executionContext() const
 {
@@ skipping 71 matching lines @@
 void WorkerGlobalScope::postTask(PassOwnPtr<ExecutionContextTask> task)
 {
     thread()->runLoop().postTask(task);
 }
 
 void WorkerGlobalScope::clearInspector()
 {
     m_workerInspectorController.clear();
 }
 
+void WorkerGlobalScope::detach()
+{
+    ASSERT(thread()->isCurrentThread());
+
+    // Notify proxy that we are going away. This can free the WorkerThread object, so do not access it after this.
+    thread()->workerReportingProxy().workerGlobalScopeDestroyed();
+
+    clearScript();
+    clearInspector();
+    setClient(0);
+    clearThread();
+}
+
 void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionState& exceptionState)
 {
     ASSERT(contentSecurityPolicy());
     Vector<String>::const_iterator urlsEnd = urls.end();
     Vector<KURL> completedURLs;
     for (Vector<String>::const_iterator it = urls.begin(); it != urlsEnd; ++it) {
         const KURL& url = executionContext()->completeURL(*it);
         if (!url.isValid()) {
             exceptionState.throwDOMException(SyntaxError, "The URL '" + *it + "' is invalid.");
             return;
@@ skipping 71 matching lines @@
 bool WorkerGlobalScope::idleNotification()
 {
     return script()->idleNotification();
 }
 
 WorkerEventQueue* WorkerGlobalScope::eventQueue() const
 {
     return m_eventQueue.get();
 }
 
+void WorkerGlobalScope::trace(Visitor* visitor)
+{
+    visitor->trace(m_console);
+    visitor->trace(m_location);
+    visitor->trace(m_navigator);
+    WorkerSupplementable::trace(visitor);
+}
+
 } // namespace WebCore