| Index: content/browser/devtools/embedded_worker_devtools_manager.h
|
| diff --git a/content/browser/devtools/embedded_worker_devtools_manager.h b/content/browser/devtools/embedded_worker_devtools_manager.h
|
| index 3b15c8f209967344375d3a70ca3325de225fb4e2..5758602376332fc9edf1d1a009a703c9b3fd09ff 100644
|
| --- a/content/browser/devtools/embedded_worker_devtools_manager.h
|
| +++ b/content/browser/devtools/embedded_worker_devtools_manager.h
|
| @@ -17,6 +17,7 @@
|
| namespace content {
|
|
|
| class DevToolsAgentHost;
|
| +class DevToolsTarget;
|
| class ServiceWorkerContextCore;
|
|
|
| // EmbeddedWorkerDevToolsManager is used instead of WorkerDevToolsManager when
|
| @@ -25,7 +26,6 @@ class ServiceWorkerContextCore;
|
| class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
|
| public:
|
| typedef std::pair<int, int> WorkerId;
|
| - class EmbeddedWorkerDevToolsAgentHost;
|
|
|
| class ServiceWorkerIdentifier {
|
| public:
|
| @@ -38,6 +38,7 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
|
| bool Matches(const ServiceWorkerIdentifier& other) const;
|
|
|
| private:
|
| + friend class EmbeddedWorkerDevToolsManager;
|
| const ServiceWorkerContextCore* const service_worker_context_;
|
| const int64 service_worker_version_id_;
|
| };
|
| @@ -50,6 +51,8 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
|
| DevToolsAgentHost* GetDevToolsAgentHostForServiceWorker(
|
| const ServiceWorkerIdentifier& service_worker_id);
|
|
|
| + std::vector<DevToolsTarget*> GetAllServiceWorkerTargets();
|
| +
|
| // Returns true when the worker must be paused on start because a DevTool
|
| // window for the same former SharedWorkerInstance is still opened.
|
| bool SharedWorkerCreated(int worker_process_id,
|
| @@ -85,6 +88,8 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
|
| WORKER_PAUSED_FOR_REATTACH,
|
| };
|
|
|
| + class EmbeddedWorkerDevToolsAgentHost;
|
| +
|
| class WorkerInfo {
|
| public:
|
| // Creates WorkerInfo for SharedWorker.
|
| @@ -101,6 +106,9 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
|
| }
|
| bool Matches(const SharedWorkerInstance& other);
|
| bool Matches(const ServiceWorkerIdentifier& other);
|
| + ServiceWorkerIdentifier* service_worker_id() {
|
| + return service_worker_id_.get();
|
| + }
|
|
|
| private:
|
| scoped_ptr<SharedWorkerInstance> shared_worker_instance_;
|
| @@ -109,6 +117,8 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
|
| EmbeddedWorkerDevToolsAgentHost* agent_host_;
|
| };
|
|
|
| + class ServiceWorkerTarget;
|
| +
|
| typedef base::ScopedPtrHashMap<WorkerId, WorkerInfo> WorkerInfoMap;
|
|
|
| EmbeddedWorkerDevToolsManager();
|
| @@ -123,6 +133,10 @@ class CONTENT_EXPORT EmbeddedWorkerDevToolsManager {
|
|
|
| void MoveToPausedState(const WorkerId& id, const WorkerInfoMap::iterator& it);
|
|
|
| + EmbeddedWorkerDevToolsAgentHost* GetOrCreateAgentHost(int worker_process_id,
|
| + int worker_route_id);
|
| + bool CloseServiceWorker(const WorkerId& id);
|
| +
|
| // Resets to its initial state as if newly created.
|
| void ResetForTesting();
|
|
|
|
|