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

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

Issue 3472010: Fix the problem that BlobDispatcherHost is not hooked up in WorkerProcessHost... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/worker_host/worker_process_host.h ('k') | chrome/common/webblobregistry_impl.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/browser/worker_host/worker_process_host.h" 5 #include "chrome/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/callback.h" 10 #include "base/callback.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/debug_util.h" 12 #include "base/debug_util.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/appcache/appcache_dispatcher_host.h" 16 #include "chrome/browser/appcache/appcache_dispatcher_host.h"
17 #include "chrome/browser/chrome_thread.h" 17 #include "chrome/browser/chrome_thread.h"
18 #include "chrome/browser/child_process_security_policy.h" 18 #include "chrome/browser/child_process_security_policy.h"
19 #include "chrome/browser/net/chrome_url_request_context.h" 19 #include "chrome/browser/net/chrome_url_request_context.h"
20 #include "chrome/browser/profile.h" 20 #include "chrome/browser/profile.h"
21 #include "chrome/browser/renderer_host/blob_dispatcher_host.h"
21 #include "chrome/browser/renderer_host/database_dispatcher_host.h" 22 #include "chrome/browser/renderer_host/database_dispatcher_host.h"
22 #include "chrome/browser/renderer_host/render_view_host.h" 23 #include "chrome/browser/renderer_host/render_view_host.h"
23 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 24 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
24 #include "chrome/browser/renderer_host/resource_message_filter.h" 25 #include "chrome/browser/renderer_host/resource_message_filter.h"
25 #include "chrome/browser/worker_host/message_port_dispatcher.h" 26 #include "chrome/browser/worker_host/message_port_dispatcher.h"
26 #include "chrome/browser/worker_host/worker_service.h" 27 #include "chrome/browser/worker_host/worker_service.h"
27 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/debug_flags.h" 29 #include "chrome/common/debug_flags.h"
29 #include "chrome/common/notification_service.h" 30 #include "chrome/common/notification_service.h"
30 #include "chrome/common/render_messages.h" 31 #include "chrome/common/render_messages.h"
(...skipping 25 matching lines...) Expand all
56 int render_process_unique_id_; 57 int render_process_unique_id_;
57 int render_view_id_; 58 int render_view_id_;
58 }; 59 };
59 60
60 WorkerProcessHost::WorkerProcessHost( 61 WorkerProcessHost::WorkerProcessHost(
61 ResourceDispatcherHost* resource_dispatcher_host, 62 ResourceDispatcherHost* resource_dispatcher_host,
62 ChromeURLRequestContext *request_context) 63 ChromeURLRequestContext *request_context)
63 : BrowserChildProcessHost(WORKER_PROCESS, resource_dispatcher_host), 64 : BrowserChildProcessHost(WORKER_PROCESS, resource_dispatcher_host),
64 request_context_(request_context), 65 request_context_(request_context),
65 appcache_dispatcher_host_( 66 appcache_dispatcher_host_(
66 new AppCacheDispatcherHost(request_context)) { 67 new AppCacheDispatcherHost(request_context)),
68 ALLOW_THIS_IN_INITIALIZER_LIST(blob_dispatcher_host_(
69 new BlobDispatcherHost(
70 this->id(), request_context->blob_storage_context()))) {
67 next_route_id_callback_.reset(NewCallbackWithReturnValue( 71 next_route_id_callback_.reset(NewCallbackWithReturnValue(
68 WorkerService::GetInstance(), &WorkerService::next_worker_route_id)); 72 WorkerService::GetInstance(), &WorkerService::next_worker_route_id));
69 db_dispatcher_host_ = new DatabaseDispatcherHost( 73 db_dispatcher_host_ = new DatabaseDispatcherHost(
70 request_context->database_tracker(), this, 74 request_context->database_tracker(), this,
71 request_context_->host_content_settings_map()); 75 request_context_->host_content_settings_map());
72 appcache_dispatcher_host_->Initialize(this); 76 appcache_dispatcher_host_->Initialize(this);
73 } 77 }
74 78
75 WorkerProcessHost::~WorkerProcessHost() { 79 WorkerProcessHost::~WorkerProcessHost() {
76 // Shut down the database dispatcher host. 80 // Shut down the database dispatcher host.
77 db_dispatcher_host_->Shutdown(); 81 db_dispatcher_host_->Shutdown();
78 82
83 // Shut down the blob dispatcher host.
84 blob_dispatcher_host_->Shutdown();
85
79 // Let interested observers know we are being deleted. 86 // Let interested observers know we are being deleted.
80 NotificationService::current()->Notify( 87 NotificationService::current()->Notify(
81 NotificationType::WORKER_PROCESS_HOST_SHUTDOWN, 88 NotificationType::WORKER_PROCESS_HOST_SHUTDOWN,
82 Source<WorkerProcessHost>(this), 89 Source<WorkerProcessHost>(this),
83 NotificationService::NoDetails()); 90 NotificationService::NoDetails());
84 91
85 // If we crashed, tell the RenderViewHosts. 92 // If we crashed, tell the RenderViewHosts.
86 for (Instances::iterator i = instances_.begin(); i != instances_.end(); ++i) { 93 for (Instances::iterator i = instances_.begin(); i != instances_.end(); ++i) {
87 const WorkerDocumentSet::DocumentInfoSet& parents = 94 const WorkerDocumentSet::DocumentInfoSet& parents =
88 i->worker_document_set()->documents(); 95 i->worker_document_set()->documents();
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 break; 233 break;
227 } 234 }
228 } 235 }
229 } 236 }
230 237
231 void WorkerProcessHost::OnMessageReceived(const IPC::Message& message) { 238 void WorkerProcessHost::OnMessageReceived(const IPC::Message& message) {
232 bool msg_is_ok = true; 239 bool msg_is_ok = true;
233 bool handled = 240 bool handled =
234 appcache_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) || 241 appcache_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
235 db_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) || 242 db_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
243 blob_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
236 MessagePortDispatcher::GetInstance()->OnMessageReceived( 244 MessagePortDispatcher::GetInstance()->OnMessageReceived(
237 message, this, next_route_id_callback_.get(), &msg_is_ok); 245 message, this, next_route_id_callback_.get(), &msg_is_ok);
238 246
239 if (!handled) { 247 if (!handled) {
240 handled = true; 248 handled = true;
241 IPC_BEGIN_MESSAGE_MAP_EX(WorkerProcessHost, message, msg_is_ok) 249 IPC_BEGIN_MESSAGE_MAP_EX(WorkerProcessHost, message, msg_is_ok)
242 IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWorker, OnCreateWorker) 250 IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWorker, OnCreateWorker)
243 IPC_MESSAGE_HANDLER(ViewHostMsg_LookupSharedWorker, OnLookupSharedWorker) 251 IPC_MESSAGE_HANDLER(ViewHostMsg_LookupSharedWorker, OnLookupSharedWorker)
244 IPC_MESSAGE_HANDLER(ViewHostMsg_CancelCreateDedicatedWorker, 252 IPC_MESSAGE_HANDLER(ViewHostMsg_CancelCreateDedicatedWorker,
245 OnCancelCreateDedicatedWorker) 253 OnCancelCreateDedicatedWorker)
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 } 605 }
598 } 606 }
599 return false; 607 return false;
600 } 608 }
601 609
602 WorkerProcessHost::WorkerInstance::SenderInfo 610 WorkerProcessHost::WorkerInstance::SenderInfo
603 WorkerProcessHost::WorkerInstance::GetSender() const { 611 WorkerProcessHost::WorkerInstance::GetSender() const {
604 DCHECK(NumSenders() == 1); 612 DCHECK(NumSenders() == 1);
605 return *senders_.begin(); 613 return *senders_.begin();
606 } 614 }
OLDNEW
« no previous file with comments | « chrome/browser/worker_host/worker_process_host.h ('k') | chrome/common/webblobregistry_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698