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

Side by Side Diff: content/browser/devtools/worker_devtools_manager.cc

Issue 976353002: DevTools: land service worker handler (patch 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@worker2
Patch Set: review comments addressed Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « content/browser/devtools/worker_devtools_manager.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/devtools/worker_devtools_manager.h" 5 #include "content/browser/devtools/worker_devtools_manager.h"
6 6
7 #include "content/browser/devtools/devtools_manager.h" 7 #include "content/browser/devtools/devtools_manager.h"
8 #include "content/browser/devtools/service_worker_devtools_manager.h" 8 #include "content/browser/devtools/service_worker_devtools_manager.h"
9 #include "content/browser/devtools/shared_worker_devtools_manager.h" 9 #include "content/browser/devtools/shared_worker_devtools_manager.h"
10 #include "content/browser/devtools/worker_devtools_agent_host.h" 10 #include "content/browser/devtools/worker_devtools_agent_host.h"
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 } 42 }
43 43
44 void WorkerDevToolsManager::WorkerDestroyed(int worker_process_id, 44 void WorkerDevToolsManager::WorkerDestroyed(int worker_process_id,
45 int worker_route_id) { 45 int worker_route_id) {
46 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 46 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
47 const WorkerId id(worker_process_id, worker_route_id); 47 const WorkerId id(worker_process_id, worker_route_id);
48 AgentHostMap::iterator it = workers_.find(id); 48 AgentHostMap::iterator it = workers_.find(id);
49 DCHECK(it != workers_.end()); 49 DCHECK(it != workers_.end());
50 scoped_refptr<WorkerDevToolsAgentHost> agent_host(it->second); 50 scoped_refptr<WorkerDevToolsAgentHost> agent_host(it->second);
51 FOR_EACH_OBSERVER(Observer, observer_list_, WorkerDestroyed(it->second));
51 agent_host->WorkerDestroyed(); 52 agent_host->WorkerDestroyed();
52 DevToolsManager::GetInstance()->AgentHostChanged(agent_host); 53 DevToolsManager::GetInstance()->AgentHostChanged(agent_host);
53 } 54 }
54 55
55 void WorkerDevToolsManager::WorkerReadyForInspection(int worker_process_id, 56 void WorkerDevToolsManager::WorkerReadyForInspection(int worker_process_id,
56 int worker_route_id) { 57 int worker_route_id) {
57 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 58 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
58 const WorkerId id(worker_process_id, worker_route_id); 59 const WorkerId id(worker_process_id, worker_route_id);
59 AgentHostMap::iterator it = workers_.find(id); 60 AgentHostMap::iterator it = workers_.find(id);
60 DCHECK(it != workers_.end()); 61 DCHECK(it != workers_.end());
61 it->second->WorkerReadyForInspection(); 62 it->second->WorkerReadyForInspection();
62 } 63 }
63 64
65 void WorkerDevToolsManager::AddObserver(Observer* observer) {
66 observer_list_.AddObserver(observer);
67 }
68
69 void WorkerDevToolsManager::RemoveObserver(Observer* observer) {
70 observer_list_.RemoveObserver(observer);
71 }
72
64 WorkerDevToolsManager::WorkerDevToolsManager() { 73 WorkerDevToolsManager::WorkerDevToolsManager() {
65 } 74 }
66 75
67 WorkerDevToolsManager::~WorkerDevToolsManager() { 76 WorkerDevToolsManager::~WorkerDevToolsManager() {
68 } 77 }
69 78
70 void WorkerDevToolsManager::RemoveInspectedWorkerData(WorkerId id) { 79 void WorkerDevToolsManager::RemoveInspectedWorkerData(WorkerId id) {
71 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 80 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
72 workers_.erase(id); 81 workers_.erase(id);
73 } 82 }
74 83
84 void WorkerDevToolsManager::WorkerCreated(
85 const WorkerId& id,
86 WorkerDevToolsAgentHost* host) {
87 workers_[id] = host;
88 DevToolsManager::GetInstance()->AgentHostChanged(host);
89 scoped_refptr<WorkerDevToolsAgentHost> protector(host);
90 FOR_EACH_OBSERVER(Observer, observer_list_, WorkerCreated(host));
91 }
92
75 void WorkerDevToolsManager::WorkerRestarted(const WorkerId& id, 93 void WorkerDevToolsManager::WorkerRestarted(const WorkerId& id,
76 const AgentHostMap::iterator& it) { 94 const AgentHostMap::iterator& it) {
77 WorkerDevToolsAgentHost* agent_host = it->second; 95 WorkerDevToolsAgentHost* agent_host = it->second;
78 agent_host->WorkerRestarted(id); 96 agent_host->WorkerRestarted(id);
79 workers_.erase(it); 97 workers_.erase(it);
80 workers_[id] = agent_host; 98 workers_[id] = agent_host;
81 DevToolsManager::GetInstance()->AgentHostChanged(agent_host); 99 DevToolsManager::GetInstance()->AgentHostChanged(agent_host);
82 } 100 }
83 101
102 void WorkerDevToolsManager::ResetForTesting() {
103 workers_.clear();
104 }
105
84 } // namespace content 106 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/devtools/worker_devtools_manager.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698