Index: content/browser/devtools/worker_devtools_manager.cc |
diff --git a/content/browser/devtools/worker_devtools_manager.cc b/content/browser/devtools/worker_devtools_manager.cc |
index 0658c353c64ce4b2461be4affbf83b8f2614dc5b..a267f70c5a63e5237159a645427d8f981115e247 100644 |
--- a/content/browser/devtools/worker_devtools_manager.cc |
+++ b/content/browser/devtools/worker_devtools_manager.cc |
@@ -44,7 +44,51 @@ typedef std::map<WorkerDevToolsManager::WorkerId, |
base::LazyInstance<AgentHosts>::Leaky g_agent_map = LAZY_INSTANCE_INITIALIZER; |
base::LazyInstance<AgentHosts>::Leaky g_orphan_map = LAZY_INSTANCE_INITIALIZER; |
-} // namespace |
+void CreateSharedWorkers( |
+ const DevToolsAgentHost::Callback& callback, |
+ const std::vector<WorkerService::WorkerInfo>& workers) { |
+ DevToolsAgentHost::List result; |
+ for (std::vector<WorkerService::WorkerInfo>::const_iterator it = |
+ workers.begin(); it != workers.end(); ++it) { |
+ result.push_back(WorkerDevToolsManager::GetDevToolsAgentHostForWorker( |
+ it->process_id, it->route_id)); |
+ } |
+ callback.Run(result); |
+} |
+ |
+void GetSharedWorkersInfoOnIO(const DevToolsAgentHost::Callback& callback) { |
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
+ base::Bind(&CreateSharedWorkers, callback, |
+ WorkerService::GetInstance()->GetWorkers())); |
+} |
+ |
+} // namespace |
+ |
+void CollectAllHosts(const DevToolsAgentHost::Callback& callback, |
+ const DevToolsAgentHost::List& workers) { |
+ std::vector<RenderViewHost*> rvhs = |
+ DevToolsAgentHost::GetValidRenderViewHosts(); |
+ DevToolsAgentHost::List result; |
+ for (std::vector<RenderViewHost*>::iterator it = rvhs.begin(); |
+ it != rvhs.end(); ++it) { |
+ result.push_back(DevToolsAgentHost::GetOrCreateFor(*it)); |
+ } |
+ result.insert(result.end(), workers.begin(), workers.end()); |
+ callback.Run(result); |
+} |
+ |
+// static |
+void DevToolsAgentHost::GetOrCreateAllHosts( |
dgozman
2014/07/14 11:17:24
I think, this code should be in devtools_agent_hos
vkuzkokov
2014/07/14 15:31:33
Done.
|
+ const DevToolsAgentHost::Callback& callback) { |
+ if (WorkerService::EmbeddedSharedWorkerEnabled()) { |
+ EmbeddedWorkerDevToolsManager::GetInstance()->GetOrCreateAllHosts( |
+ base::Bind(&CollectAllHosts, callback)); |
+ } else { |
+ BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
+ base::Bind(&GetSharedWorkersInfoOnIO, |
+ base::Bind(&CollectAllHosts, callback))); |
+ } |
+} |
struct WorkerDevToolsManager::TerminatedInspectedWorker { |
TerminatedInspectedWorker(WorkerId id, |