Index: content/renderer/service_worker/embedded_worker_instance_client_impl.h |
diff --git a/content/renderer/service_worker/embedded_worker_instance_client_impl.h b/content/renderer/service_worker/embedded_worker_instance_client_impl.h |
index 228efc650a848d353f72af9a3ed9510202a67fec..cdc7aef20ae26472c03862920c07c8d21ba903f0 100644 |
--- a/content/renderer/service_worker/embedded_worker_instance_client_impl.h |
+++ b/content/renderer/service_worker/embedded_worker_instance_client_impl.h |
@@ -5,43 +5,73 @@ |
#ifndef CONTENT_RENDERER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_CLIENT_IMPL_H_ |
#define CONTENT_RENDERER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_CLIENT_IMPL_H_ |
+#include <memory> |
+ |
#include "base/id_map.h" |
#include "base/optional.h" |
+#include "base/time/time.h" |
#include "content/child/child_thread_impl.h" |
+#include "content/child/scoped_child_process_reference.h" |
#include "content/common/service_worker/embedded_worker.mojom.h" |
-#include "content/renderer/service_worker/embedded_worker_dispatcher.h" |
#include "mojo/public/cpp/bindings/binding.h" |
-#include "mojo/public/cpp/bindings/interface_ptr.h" |
+ |
+namespace blink { |
+ |
+class WebEmbeddedWorker; |
+ |
+} // namespace blink |
namespace content { |
+class EmbeddedWorkerDevToolsAgent; |
+class ServiceWorkerContextClient; |
+ |
// This class exposes interfaces of WebEmbeddedWorker to the browser process. |
// Unless otherwise noted, all methods should be called on the main thread. |
class EmbeddedWorkerInstanceClientImpl |
: public mojom::EmbeddedWorkerInstanceClient { |
public: |
static void Create( |
- EmbeddedWorkerDispatcher* dispatcher, |
mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request); |
~EmbeddedWorkerInstanceClientImpl() override; |
// Called from ServiceWorkerContextClient. |
- void StopWorkerCompleted(); |
+ void WorkerContextDestroyed(); |
EmbeddedWorkerDevToolsAgent* devtools_agent() { |
return wrapper_->devtools_agent(); |
}; |
private: |
+ // A thin wrapper of WebEmbeddedWorker which also adds and releases process |
+ // references automatically. |
+ class WorkerWrapper { |
+ public: |
+ WorkerWrapper(blink::WebEmbeddedWorker* worker, |
+ int devtools_agent_route_id); |
+ ~WorkerWrapper(); |
+ |
+ blink::WebEmbeddedWorker* worker() { return worker_.get(); } |
+ EmbeddedWorkerDevToolsAgent* devtools_agent() { |
+ return devtools_agent_.get(); |
+ } |
+ |
+ private: |
+ ScopedChildProcessReference process_ref_; |
+ std::unique_ptr<blink::WebEmbeddedWorker> worker_; |
+ std::unique_ptr<EmbeddedWorkerDevToolsAgent> devtools_agent_; |
+ }; |
+ |
EmbeddedWorkerInstanceClientImpl( |
- EmbeddedWorkerDispatcher* dispatcher, |
mojo::InterfaceRequest<mojom::EmbeddedWorkerInstanceClient> request); |
// mojom::EmbeddedWorkerInstanceClient implementation |
void StartWorker( |
const EmbeddedWorkerStartParams& params, |
- mojom::ServiceWorkerEventDispatcherRequest dispatcher_request) override; |
- void StopWorker(const StopWorkerCallback& callback) override; |
+ mojom::ServiceWorkerEventDispatcherRequest dispatcher_request, |
+ mojom::EmbeddedWorkerInstanceHostAssociatedPtrInfo instance_host) |
+ override; |
+ void StopWorker() override; |
void ResumeAfterDownload() override; |
void AddMessageToConsole(blink::WebConsoleMessage::Level level, |
const std::string& message) override; |
@@ -49,20 +79,20 @@ class EmbeddedWorkerInstanceClientImpl |
// Handler of connection error bound to |binding_| |
void OnError(); |
- EmbeddedWorkerDispatcher* dispatcher_; |
+ std::unique_ptr<WorkerWrapper> StartWorkerContext( |
+ const EmbeddedWorkerStartParams& params, |
+ std::unique_ptr<ServiceWorkerContextClient> context_client); |
+ |
mojo::Binding<mojom::EmbeddedWorkerInstanceClient> binding_; |
// This is valid before StartWorker is called. After that, this object |
// will be passed to ServiceWorkerContextClient. |
std::unique_ptr<EmbeddedWorkerInstanceClientImpl> temporal_self_; |
- base::Optional<int> embedded_worker_id_; |
- |
- // Owned by EmbeddedWorkerDispatcher. This can be nullptr while a worker is |
- // not running. |
- EmbeddedWorkerDispatcher::WorkerWrapper* wrapper_; |
+ // nullptr means the worker is not running. |
+ std::unique_ptr<WorkerWrapper> wrapper_; |
- StopWorkerCallback stop_callback_; |
+ base::Optional<base::TimeTicks> stop_worker_time_; |
DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerInstanceClientImpl); |
}; |