Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2807)

Unified Diff: content/renderer/service_worker/embedded_worker_dispatcher.h

Issue 2378073002: Reland of ServiceWorker: Implement StartWorker by using mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/service_worker/embedded_worker_dispatcher.h
diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.h b/content/renderer/service_worker/embedded_worker_dispatcher.h
index e77086f75e42e14132168fb88936cfb869e39884..9c706fa813191cbbf640661c069039200bb189ee 100644
--- a/content/renderer/service_worker/embedded_worker_dispatcher.h
+++ b/content/renderer/service_worker/embedded_worker_dispatcher.h
@@ -6,18 +6,29 @@
#define CONTENT_RENDERER_SERVICE_WORKER_EMBEDDED_WORKER_DISPATCHER_H_
#include <map>
+#include <memory>
#include "base/id_map.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
+#include "content/child/scoped_child_process_reference.h"
#include "content/public/common/console_message_level.h"
#include "ipc/ipc_listener.h"
-struct EmbeddedWorkerMsg_StartWorker_Params;
class GURL;
+namespace blink {
+
+class WebEmbeddedWorker;
+
+} // namespace blink
+
namespace content {
+
+class EmbeddedWorkerDevToolsAgent;
+class ServiceWorkerContextClient;
+struct EmbeddedWorkerStartParams;
// A tiny dispatcher which handles embedded worker start/stop messages.
class EmbeddedWorkerDispatcher : public IPC::Listener {
@@ -31,14 +42,36 @@
void WorkerContextDestroyed(int embedded_worker_id);
private:
- class WorkerWrapper;
+ friend class EmbeddedWorkerInstanceClientImpl;
- void OnStartWorker(const EmbeddedWorkerMsg_StartWorker_Params& params);
+ // 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(); }
+
+ private:
+ ScopedChildProcessReference process_ref_;
+ std::unique_ptr<blink::WebEmbeddedWorker> worker_;
+ std::unique_ptr<EmbeddedWorkerDevToolsAgent> dev_tools_agent_;
+ };
+
+ void OnStartWorker(const EmbeddedWorkerStartParams& params);
void OnStopWorker(int embedded_worker_id);
void OnResumeAfterDownload(int embedded_worker_id);
void OnAddMessageToConsole(int embedded_worker_id,
ConsoleMessageLevel level,
const std::string& message);
+
+ std::unique_ptr<WorkerWrapper> StartWorkerContext(
+ const EmbeddedWorkerStartParams& params,
+ std::unique_ptr<ServiceWorkerContextClient> context_client);
+ void RegisterWorker(int embedded_worker_id,
+ std::unique_ptr<WorkerWrapper> wrapper);
IDMap<WorkerWrapper, IDMapOwnPointer> workers_;
std::map<int /* embedded_worker_id */, base::TimeTicks> stop_worker_times_;
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/service_worker/embedded_worker_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698