Index: content/browser/worker_host/worker_process_host.cc |
=================================================================== |
--- content/browser/worker_host/worker_process_host.cc (revision 85048) |
+++ content/browser/worker_host/worker_process_host.cc (working copy) |
@@ -201,10 +201,10 @@ |
base::PLATFORM_FILE_WRITE_ATTRIBUTES); |
} |
+ // Call the embedder first so that their IPC filters have priority. |
+ content::GetContentClient()->browser()->WorkerProcessHostCreated(this); |
CreateMessageFilters(render_process_id); |
- content::GetContentClient()->browser()->WorkerProcessHostCreated(this); |
- |
return true; |
} |
@@ -228,9 +228,7 @@ |
AddFilter(worker_message_filter_); |
AddFilter(new AppCacheDispatcherHost(resource_context_, id())); |
AddFilter(new FileSystemDispatcherHost( |
- request_context, |
- resource_context_->host_content_settings_map(), |
- resource_context_->file_system_context())); |
+ request_context, resource_context_->file_system_context())); |
AddFilter(new FileUtilitiesMessageFilter(id())); |
AddFilter( |
new BlobMessageFilter(id(), resource_context_->blob_storage_context())); |
@@ -293,6 +291,8 @@ |
IPC_BEGIN_MESSAGE_MAP_EX(WorkerProcessHost, message, msg_is_ok) |
IPC_MESSAGE_HANDLER(WorkerHostMsg_WorkerContextClosed, |
OnWorkerContextClosed) |
+ IPC_MESSAGE_HANDLER(WorkerProcessHostMsg_AllowDatabase, OnAllowDatabase) |
+ IPC_MESSAGE_HANDLER(WorkerProcessHostMsg_AllowFileSystem, OnAllowFileSystem) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP_EX() |
@@ -338,6 +338,21 @@ |
} |
} |
+void WorkerProcessHost::OnAllowDatabase(int worker_route_id, |
+ const GURL& url, |
+ const string16& name, |
+ const string16& display_name, |
+ unsigned long estimated_size, |
+ bool* result) { |
+ *result = true; |
+} |
+ |
+void WorkerProcessHost::OnAllowFileSystem(int worker_route_id, |
+ const GURL& url, |
+ bool* result) { |
+ *result = true; |
+} |
+ |
void WorkerProcessHost::RelayMessage( |
const IPC::Message& message, |
WorkerMessageFilter* filter, |