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

Side by Side Diff: content/browser/worker_host/worker_process_host.cc

Issue 8760011: Move the ProcessType enum out to its own file. This is in preparation for getting rid of ChildPro... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/utility_process_host.cc ('k') | content/browser/worker_host/worker_service.cc » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/worker_host/worker_process_host.h" 5 #include "content/browser/worker_host/worker_process_host.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void WorkerCrashCallback(int render_process_unique_id, int render_view_id) { 77 void WorkerCrashCallback(int render_process_unique_id, int render_view_id) {
78 RenderViewHost* host = 78 RenderViewHost* host =
79 RenderViewHost::FromID(render_process_unique_id, render_view_id); 79 RenderViewHost::FromID(render_process_unique_id, render_view_id);
80 if (host) 80 if (host)
81 host->delegate()->WorkerCrashed(); 81 host->delegate()->WorkerCrashed();
82 } 82 }
83 83
84 WorkerProcessHost::WorkerProcessHost( 84 WorkerProcessHost::WorkerProcessHost(
85 const content::ResourceContext* resource_context, 85 const content::ResourceContext* resource_context,
86 ResourceDispatcherHost* resource_dispatcher_host) 86 ResourceDispatcherHost* resource_dispatcher_host)
87 : BrowserChildProcessHost(WORKER_PROCESS), 87 : BrowserChildProcessHost(content::PROCESS_TYPE_WORKER),
88 resource_context_(resource_context), 88 resource_context_(resource_context),
89 resource_dispatcher_host_(resource_dispatcher_host) { 89 resource_dispatcher_host_(resource_dispatcher_host) {
90 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 90 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
91 DCHECK(resource_context); 91 DCHECK(resource_context);
92 } 92 }
93 93
94 WorkerProcessHost::~WorkerProcessHost() { 94 WorkerProcessHost::~WorkerProcessHost() {
95 // If we crashed, tell the RenderViewHosts. 95 // If we crashed, tell the RenderViewHosts.
96 for (Instances::iterator i = instances_.begin(); i != instances_.end(); ++i) { 96 for (Instances::iterator i = instances_.begin(); i != instances_.end(); ++i) {
97 const WorkerDocumentSet::DocumentInfoSet& parents = 97 const WorkerDocumentSet::DocumentInfoSet& parents =
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 return true; 228 return true;
229 } 229 }
230 230
231 void WorkerProcessHost::CreateMessageFilters(int render_process_id) { 231 void WorkerProcessHost::CreateMessageFilters(int render_process_id) {
232 DCHECK(resource_context_); 232 DCHECK(resource_context_);
233 net::URLRequestContext* request_context = 233 net::URLRequestContext* request_context =
234 resource_context_->request_context(); 234 resource_context_->request_context();
235 235
236 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter( 236 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
237 id(), WORKER_PROCESS, resource_context_, 237 id(), content::PROCESS_TYPE_WORKER, resource_context_,
238 new URLRequestContextSelector(request_context), 238 new URLRequestContextSelector(request_context),
239 resource_dispatcher_host_); 239 resource_dispatcher_host_);
240 AddFilter(resource_message_filter); 240 AddFilter(resource_message_filter);
241 241
242 worker_message_filter_ = new WorkerMessageFilter( 242 worker_message_filter_ = new WorkerMessageFilter(
243 render_process_id, resource_context_, resource_dispatcher_host_, 243 render_process_id, resource_context_, resource_dispatcher_host_,
244 base::Bind(&WorkerService::next_worker_route_id, 244 base::Bind(&WorkerService::next_worker_route_id,
245 base::Unretained(WorkerService::GetInstance()))); 245 base::Unretained(WorkerService::GetInstance())));
246 AddFilter(worker_message_filter_); 246 AddFilter(worker_message_filter_);
247 AddFilter(new AppCacheDispatcherHost( 247 AddFilter(new AppCacheDispatcherHost(
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 } 623 }
624 } 624 }
625 return false; 625 return false;
626 } 626 }
627 627
628 WorkerProcessHost::WorkerInstance::FilterInfo 628 WorkerProcessHost::WorkerInstance::FilterInfo
629 WorkerProcessHost::WorkerInstance::GetFilter() const { 629 WorkerProcessHost::WorkerInstance::GetFilter() const {
630 DCHECK(NumFilters() == 1); 630 DCHECK(NumFilters() == 1);
631 return *filters_.begin(); 631 return *filters_.begin();
632 } 632 }
OLDNEW
« no previous file with comments | « content/browser/utility_process_host.cc ('k') | content/browser/worker_host/worker_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698