summaryrefslogtreecommitdiffstats
path: root/chrome/browser/worker_host
diff options
context:
space:
mode:
authormichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 23:37:20 +0000
committermichaeln@chromium.org <michaeln@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 23:37:20 +0000
commitf22a79585707eef6ef87672e8b89845122108052 (patch)
treeef450ea8694fc29af73f6738f4253f99db783e20 /chrome/browser/worker_host
parent353a34ce51417f032198c1c537af4180d8eb9af2 (diff)
downloadchromium_src-f22a79585707eef6ef87672e8b89845122108052.zip
chromium_src-f22a79585707eef6ef87672e8b89845122108052.tar.gz
chromium_src-f22a79585707eef6ef87672e8b89845122108052.tar.bz2
Defend against messages being received prior to having been initialized.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2321002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/worker_host')
-rw-r--r--chrome/browser/worker_host/worker_process_host.cc2
-rw-r--r--chrome/browser/worker_host/worker_process_host.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc
index 9672c1b..ccb7e78 100644
--- a/chrome/browser/worker_host/worker_process_host.cc
+++ b/chrome/browser/worker_host/worker_process_host.cc
@@ -67,6 +67,7 @@ WorkerProcessHost::WorkerProcessHost(
db_dispatcher_host_ = new DatabaseDispatcherHost(
request_context->database_tracker(), this,
request_context_->host_content_settings_map());
+ appcache_dispatcher_host_->Initialize(this);
}
WorkerProcessHost::~WorkerProcessHost() {
@@ -314,7 +315,6 @@ void WorkerProcessHost::OnMessageReceived(const IPC::Message& message) {
void WorkerProcessHost::OnProcessLaunched() {
db_dispatcher_host_->Init(handle());
- appcache_dispatcher_host_->Initialize(this, id(), handle());
}
CallbackWithReturnValue<int>::Type* WorkerProcessHost::GetNextRouteIdCallback(
diff --git a/chrome/browser/worker_host/worker_process_host.h b/chrome/browser/worker_host/worker_process_host.h
index 0278d1c..edcfb05 100644
--- a/chrome/browser/worker_host/worker_process_host.h
+++ b/chrome/browser/worker_host/worker_process_host.h
@@ -153,7 +153,7 @@ class WorkerProcessHost : public ChildProcessHost {
const ViewHostMsg_Resource_Request& request_data);
// Called when a message arrives from the worker process.
- void OnMessageReceived(const IPC::Message& message);
+ virtual void OnMessageReceived(const IPC::Message& message);
// Called when the process has been launched successfully.
virtual void OnProcessLaunched();