Chromium Code Reviews| Index: content/browser/shared_worker/shared_worker_host.cc |
| diff --git a/content/browser/shared_worker/shared_worker_host.cc b/content/browser/shared_worker/shared_worker_host.cc |
| index 9fc9d67ec3af8af663c2b3d2ec769767fb18c384..a0fe77462a87a99cd2c27fc487df123fef013da7 100644 |
| --- a/content/browser/shared_worker/shared_worker_host.cc |
| +++ b/content/browser/shared_worker/shared_worker_host.cc |
| @@ -63,6 +63,7 @@ SharedWorkerHost::SharedWorkerHost(SharedWorkerInstance* instance, |
| int worker_route_id) |
| : instance_(instance), |
| worker_document_set_(new WorkerDocumentSet()), |
| + weak_factory_(this), |
| container_render_filter_(filter), |
| worker_process_id_(filter->render_process_id()), |
| worker_route_id_(worker_route_id), |
| @@ -221,11 +222,25 @@ void SharedWorkerHost::AllowDatabase(const GURL& url, |
| } |
| void SharedWorkerHost::AllowFileSystem(const GURL& url, |
| - bool* result) { |
| + IPC::Message* reply_msg) { |
| if (!instance_) |
|
Andrew T Wilson (Slow)
2014/06/26 15:49:33
Does reply_msg leak in this case? Perhaps reply_ms
Xi Han
2014/06/26 18:57:53
Done.
|
| return; |
| - *result = GetContentClient()->browser()->AllowWorkerFileSystem( |
| - url, instance_->resource_context(), GetRenderFrameIDsForWorker()); |
| + GetContentClient()->browser()->AllowWorkerFileSystem( |
| + url, |
| + instance_->resource_context(), |
| + GetRenderFrameIDsForWorker(), |
| + base::Bind(&SharedWorkerHost::AllowFileSystemResponse, |
| + weak_factory_.GetWeakPtr(), |
| + base::Passed(scoped_ptr<IPC::Message>(reply_msg)))); |
| +} |
| + |
| +void SharedWorkerHost::AllowFileSystemResponse( |
| + scoped_ptr<IPC::Message> reply_msg, |
| + bool allowed) { |
| + WorkerProcessHostMsg_RequestFileSystemAccessSync::WriteReplyParams( |
| + reply_msg.get(), |
| + allowed); |
| + Send(reply_msg.release()); |
| } |
| void SharedWorkerHost::AllowIndexedDB(const GURL& url, |