Index: content/browser/devtools/devtools_agent_host_impl.cc |
diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc |
index bcb60b55b7832b0348550bead85a164ffffc1539..f18b984debf630bb9a0f87d5db04fcba25b346cd 100644 |
--- a/content/browser/devtools/devtools_agent_host_impl.cc |
+++ b/content/browser/devtools/devtools_agent_host_impl.cc |
@@ -10,16 +10,65 @@ |
#include "base/guid.h" |
#include "base/lazy_instance.h" |
#include "content/browser/devtools/devtools_manager_impl.h" |
+#include "content/browser/devtools/embedded_worker_devtools_manager.h" |
#include "content/browser/devtools/forwarding_agent_host.h" |
+#include "content/browser/devtools/worker_devtools_manager.h" |
#include "content/public/browser/browser_thread.h" |
+#include "content/public/browser/worker_service.h" |
namespace content { |
namespace { |
+ |
typedef std::map<std::string, DevToolsAgentHostImpl*> Instances; |
base::LazyInstance<Instances>::Leaky g_instances = LAZY_INSTANCE_INITIALIZER; |
+ |
+void CreateSharedWorkers( |
+ const DevToolsAgentHost::ListCallback& 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::ListCallback& callback) { |
+ BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
+ base::Bind(&CreateSharedWorkers, callback, |
+ WorkerService::GetInstance()->GetWorkers())); |
+} |
+ |
} // namespace |
+void CollectAllHosts(const DevToolsAgentHost::ListCallback& callback, |
+ const DevToolsAgentHost::List& workers) { |
+ std::vector<RenderViewHost*> rvhs = |
+ DevToolsAgentHostImpl::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( |
+ const DevToolsAgentHost::ListCallback& 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))); |
+ } |
+} |
+ |
DevToolsAgentHostImpl::DevToolsAgentHostImpl() |
: close_listener_(NULL), |
id_(base::GenerateGUID()) { |
@@ -72,6 +121,10 @@ bool DevToolsAgentHostImpl::IsWorker() const { |
return false; |
} |
+GURL DevToolsAgentHostImpl::GetURL() { |
+ return GURL(); |
+} |
+ |
void DevToolsAgentHostImpl::NotifyCloseListener() { |
if (close_listener_) { |
scoped_refptr<DevToolsAgentHostImpl> protect(this); |