Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / worker / websharedworker_stub.cc

diff --git a/src/content/worker/websharedworker_stub.cc b/src/content/worker/websharedworker_stub.cc
index 2737f6c..b33e707 100644 (file)
--- a/src/content/worker/websharedworker_stub.cc
+++ b/src/content/worker/websharedworker_stub.cc
@@ -4,6 +4,7 @@
 
 #include "content/worker/websharedworker_stub.h"
 
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "content/child/child_process.h"
 #include "content/child/child_thread.h"
@@ -11,10 +12,11 @@
 #include "content/child/shared_worker_devtools_agent.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
+#include "content/public/common/content_switches.h"
 #include "content/worker/worker_thread.h"
-#include "third_party/WebKit/public/web/WebSharedWorker.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
+#include "third_party/WebKit/public/web/WebSharedWorker.h"
 
 namespace content {
 
@@ -23,6 +25,7 @@ WebSharedWorkerStub::WebSharedWorkerStub(
     const base::string16& name,
     const base::string16& content_security_policy,
     blink::WebContentSecurityPolicyType security_policy_type,
+    bool pause_on_start,
     int route_id)
     : route_id_(route_id),
       client_(route_id, this),
@@ -33,10 +36,16 @@ WebSharedWorkerStub::WebSharedWorkerStub(
   DCHECK(worker_thread);
   worker_thread->AddWorkerStub(this);
   // Start processing incoming IPCs for this worker.
-  worker_thread->AddRoute(route_id_, this);
+  worker_thread->GetRouter()->AddRoute(route_id_, this);
 
   // TODO(atwilson): Add support for NaCl when they support MessagePorts.
   impl_ = blink::WebSharedWorker::create(client());
+  if (pause_on_start) {
+    // Pause worker context when it starts and wait until either DevTools client
+    // is attached or explicit resume notification is received.
+    impl_->pauseWorkerContextOnStart();
+  }
+
   worker_devtools_agent_.reset(new SharedWorkerDevToolsAgent(route_id, impl_));
   client()->set_devtools_agent(worker_devtools_agent_.get());
   impl_->startWorkerContext(url_, name,
@@ -48,7 +57,7 @@ WebSharedWorkerStub::~WebSharedWorkerStub() {
   WorkerThread* worker_thread = WorkerThread::current();
   DCHECK(worker_thread);
   worker_thread->RemoveWorkerStub(this);
-  worker_thread->RemoveRoute(route_id_);
+  worker_thread->GetRouter()->RemoveRoute(route_id_);
 }
 
 void WebSharedWorkerStub::Shutdown() {