Make DevTools support for the embedded SharedWorker.

content/browser/devtools/shared_worker_devtools_manager.h

Index: content/browser/devtools/shared_worker_devtools_manager.h
diff --git a/content/browser/devtools/worker_devtools_manager.h b/content/browser/devtools/shared_worker_devtools_manager.h
similarity index 16%
copy from content/browser/devtools/worker_devtools_manager.h
copy to content/browser/devtools/shared_worker_devtools_manager.h
index 8a9a708422648f1c6bd3fa9458e97a0464d750a7..19a328291262093723f2a22a16d3b49ed1a4b966 100644
--- a/content/browser/devtools/worker_devtools_manager.h
+++ b/content/browser/devtools/shared_worker_devtools_manager.h
@@ -2,40 +2,43 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MANAGER_H_
-#define CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MANAGER_H_
-
-#include <list>
-#include <map>
-#include <string>
+#ifndef CONTENT_BROWSER_DEVTOOLS_SHARED_WORKER_DEVTOOLS_MANAGER_H_
+#define CONTENT_BROWSER_DEVTOOLS_SHARED_WORKER_DEVTOOLS_MANAGER_H_
 
 #include "base/basictypes.h"
+#include "base/containers/scoped_ptr_hash_map.h"
+#include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
-#include "content/browser/worker_host/worker_process_host.h"
-#include "content/common/content_export.h"
+#include "base/strings/string16.h"
 
-namespace content {
+class GURL;
 
+namespace content {
 class DevToolsAgentHost;
 
-// All methods are supposed to be called on the IO thread.
-class WorkerDevToolsManager {
+// SharedWorkerDevToolsManager is used instead of WorkerDevToolsManager when
+// "enable-embedded-shared-worker" flag is set.
+// This class lives in UI thread.
+class SharedWorkerDevToolsManager {
  public:
   typedef std::pair<int, int> WorkerId;
-  class WorkerDevToolsAgentHost;
+  class SharedWorkerDevtoolsAgentHost;

[yurys, 2014/03/13 09:06:52]

SharedWorkerDevtoolsAgentHost -> SharedWorkerDevToolsAgentHost

[horo, 2014/03/14 08:53:20]

Done.

 
-  // Returns the WorkerDevToolsManager singleton.
-  static WorkerDevToolsManager* GetInstance();
+  // Returns the SharedWorkerDevToolsManager singleton.
+  static SharedWorkerDevToolsManager* GetInstance();
 
-  // Called on the UI thread.
-  static DevToolsAgentHost* GetDevToolsAgentHostForWorker(
-      int worker_process_id,
-      int worker_route_id);
+  static DevToolsAgentHost* GetDevToolsAgentHostForWorker(int worker_process_id,
+                                                          int worker_route_id);
 
-  // Called on the UI thread.
-  static bool HasDevToolsAgentHostForWorker(
-      int worker_process_id,
-      int worker_route_id);
+  static bool HasDevToolsAgentHostForWorker(int worker_process_id,
+                                            int worker_route_id);
+
+  void WorkerCreated(int worker_process_id,
+                     int worker_route_id,
+                     const GURL& url,
+                     const base::string16& name);
+  void WorkerDestroyed(int worker_process_id, int worker_route_id);
+  void WorkerContextStarted(int worker_process_id, int worker_route_id);
 
   void ForwardToDevToolsClient(int worker_process_id,
                                int worker_route_id,
@@ -44,71 +47,29 @@ class WorkerDevToolsManager {
                              int worker_route_id,
                              const std::string& state);
 
-  // Called on the IO thread.
-  void WorkerCreated(
-      WorkerProcessHost* process,
-      const WorkerProcessHost::WorkerInstance& instance);
-  void WorkerDestroyed(WorkerProcessHost* process, int worker_route_id);
-  void WorkerContextStarted(WorkerProcessHost* process, int worker_route_id);
-
  private:
-  friend struct DefaultSingletonTraits<WorkerDevToolsManager>;
-  class DetachedClientHosts;
-  struct InspectedWorker;
-  typedef std::list<InspectedWorker> InspectedWorkersList;
-
-  WorkerDevToolsManager();
-  virtual ~WorkerDevToolsManager();
-
-  void RemoveInspectedWorkerData(const WorkerId& id);
-  InspectedWorkersList::iterator FindInspectedWorker(int host_id, int route_id);
-
-  void ConnectDevToolsAgentHostToWorker(int worker_process_id,
-                                        int worker_route_id);
-  void ForwardToWorkerDevToolsAgent(int worker_process_host_id,
-                                    int worker_route_id,
-                                    const IPC::Message& message);
-  static void ForwardToDevToolsClientOnUIThread(
-      int worker_process_id,
-      int worker_route_id,
-      const std::string& message);
-  static void SaveAgentRuntimeStateOnUIThread(
-      int worker_process_id,
-      int worker_route_id,
-      const std::string& state);
-  static void NotifyConnectionFailedOnIOThread(int worker_process_id,
-                                               int worker_route_id);
-  static void NotifyConnectionFailedOnUIThread(int worker_process_id,
-                                               int worker_route_id);
-  static void SendResumeToWorker(const WorkerId& id);
-
-  InspectedWorkersList inspected_workers_;
-
-  struct TerminatedInspectedWorker;
-  typedef std::list<TerminatedInspectedWorker> TerminatedInspectedWorkers;
-  // List of terminated workers for which there may be a devtools client on
-  // the UI thread. Worker entry is added into this list when inspected worker
-  // is terminated and will be removed in one of two cases:
-  // - shared worker with the same URL and name is started(in wich case we will
-  // try to reattach existing DevTools client to the new worker).
-  // - DevTools client which was inspecting terminated worker is closed on the
-  // UI thread and and WorkerDevToolsManager is notified about that on the IO
-  // thread.
-  TerminatedInspectedWorkers terminated_workers_;
-
-  typedef std::map<WorkerId, WorkerId> PausedWorkers;
-  // Map from old to new worker id for the inspected workers that have been
-  // terminated and started again in paused state. Worker data will be removed
-  // from this list in one of two cases:
-  // - DevTools client is closed on the UI thread, WorkerDevToolsManager was
-  // notified about that on the IO thread and sent "resume" message to the
-  // worker.
-  // - Existing DevTools client was reattached to the new worker.
-  PausedWorkers paused_workers_;
-
-  DISALLOW_COPY_AND_ASSIGN(WorkerDevToolsManager);
+  friend struct DefaultSingletonTraits<SharedWorkerDevToolsManager>;
+
+  SharedWorkerDevToolsManager();
+  virtual ~SharedWorkerDevToolsManager();
+
+  bool ConnectDevToolsAgentHostToWorker(const WorkerId& worker_id);
+  void RemoveInspectedWorkerData(const WorkerId& worker_id);
+
+  struct WorkerInfo;
+  typedef base::ScopedPtrHashMap<WorkerId, WorkerInfo> WorkerInfoMap;
+
+  WorkerInfoMap::iterator FindTerminatedWorker(const GURL& url,
+                                               const base::string16& name);
+
+  WorkerInfoMap uninspected_workers_;
+  WorkerInfoMap inspected_workers_;
+  WorkerInfoMap terminated_workers_;
+  WorkerInfoMap paused_workers_;
+
+  DISALLOW_COPY_AND_ASSIGN(SharedWorkerDevToolsManager);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_DEVTOOLS_WORKER_DEVTOOLS_MANAGER_H_
+#endif  // CONTENT_BROWSER_DEVTOOLS_SHARED_WORKER_DEVTOOLS_MANAGER_H_