Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/child/blob_storage/blob_message_filter.h" | 5 #include "content/child/blob_storage/blob_message_filter.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | |
| 8 #include "base/task_runner.h" | |
| 7 #include "content/child/blob_storage/blob_transport_controller.h" | 9 #include "content/child/blob_storage/blob_transport_controller.h" |
| 8 #include "content/child/thread_safe_sender.h" | 10 #include "content/child/thread_safe_sender.h" |
| 9 #include "content/common/fileapi/webblob_messages.h" | 11 #include "content/common/fileapi/webblob_messages.h" |
| 10 #include "ipc/ipc_message.h" | 12 #include "ipc/ipc_message.h" |
| 11 #include "ipc/ipc_sender.h" | 13 #include "ipc/ipc_sender.h" |
| 12 #include "storage/common/blob_storage/blob_item_bytes_request.h" | 14 #include "storage/common/blob_storage/blob_item_bytes_request.h" |
| 15 #include "storage/common/blob_storage/blob_item_bytes_response.h" | |
| 13 | 16 |
| 14 namespace content { | 17 namespace content { |
| 15 | 18 |
| 16 BlobMessageFilter::BlobMessageFilter() | 19 BlobMessageFilter::BlobMessageFilter( |
| 17 : IPC::MessageFilter(), sender_(nullptr) {} | 20 scoped_refptr<base::TaskRunner> io_runner, |
| 21 scoped_refptr<base::TaskRunner> file_runner) | |
| 22 : IPC::MessageFilter(), | |
|
kinuko
2016/04/15 15:02:32
nit: this line is probably not necessary
dmurph
2016/04/20 21:15:34
Done.
| |
| 23 sender_(nullptr), | |
| 24 io_runner_(std::move(io_runner)), | |
| 25 file_runner_(std::move(file_runner)) {} | |
| 18 | 26 |
| 19 BlobMessageFilter::~BlobMessageFilter() {} | 27 BlobMessageFilter::~BlobMessageFilter() {} |
| 20 | 28 |
| 21 void BlobMessageFilter::OnFilterAdded(IPC::Sender* sender) { | 29 void BlobMessageFilter::OnFilterAdded(IPC::Sender* sender) { |
| 22 sender_ = sender; | 30 sender_ = sender; |
| 23 } | 31 } |
| 24 | 32 |
| 33 void BlobMessageFilter::OnChannelClosing() { | |
| 34 sender_ = nullptr; | |
| 35 } | |
| 36 | |
| 25 bool BlobMessageFilter::OnMessageReceived(const IPC::Message& message) { | 37 bool BlobMessageFilter::OnMessageReceived(const IPC::Message& message) { |
| 26 bool handled = true; | 38 bool handled = true; |
| 27 IPC_BEGIN_MESSAGE_MAP(BlobMessageFilter, message) | 39 IPC_BEGIN_MESSAGE_MAP(BlobMessageFilter, message) |
| 28 IPC_MESSAGE_HANDLER(BlobStorageMsg_RequestMemoryItem, OnRequestMemoryItem) | 40 IPC_MESSAGE_HANDLER(BlobStorageMsg_RequestMemoryItem, OnRequestMemoryItem) |
| 29 IPC_MESSAGE_HANDLER(BlobStorageMsg_CancelBuildingBlob, OnCancelBuildingBlob) | 41 IPC_MESSAGE_HANDLER(BlobStorageMsg_CancelBuildingBlob, OnCancelBuildingBlob) |
| 30 IPC_MESSAGE_HANDLER(BlobStorageMsg_DoneBuildingBlob, OnDoneBuildingBlob) | 42 IPC_MESSAGE_HANDLER(BlobStorageMsg_DoneBuildingBlob, OnDoneBuildingBlob) |
| 31 IPC_MESSAGE_UNHANDLED(handled = false) | 43 IPC_MESSAGE_UNHANDLED(handled = false) |
| 32 IPC_END_MESSAGE_MAP() | 44 IPC_END_MESSAGE_MAP() |
| 33 return handled; | 45 return handled; |
| 34 } | 46 } |
| 35 | 47 |
| 36 bool BlobMessageFilter::GetSupportedMessageClasses( | 48 bool BlobMessageFilter::GetSupportedMessageClasses( |
| 37 std::vector<uint32_t>* supported_message_classes) const { | 49 std::vector<uint32_t>* supported_message_classes) const { |
| 38 supported_message_classes->push_back(BlobMsgStart); | 50 supported_message_classes->push_back(BlobMsgStart); |
| 39 return true; | 51 return true; |
| 40 } | 52 } |
| 41 | 53 |
| 42 void BlobMessageFilter::OnRequestMemoryItem( | 54 void BlobMessageFilter::OnRequestMemoryItem( |
| 43 const std::string& uuid, | 55 const std::string& uuid, |
| 44 const std::vector<storage::BlobItemBytesRequest>& requests, | 56 const std::vector<storage::BlobItemBytesRequest>& requests, |
| 45 std::vector<base::SharedMemoryHandle> memory_handles, | 57 std::vector<base::SharedMemoryHandle> memory_handles, |
| 46 const std::vector<IPC::PlatformFileForTransit>& file_handles) { | 58 const std::vector<IPC::PlatformFileForTransit>& file_handles) { |
| 47 BlobTransportController::GetInstance()->OnMemoryRequest( | 59 BlobTransportController::GetInstance()->OnMemoryRequest( |
| 48 uuid, requests, &memory_handles, file_handles, sender_); | 60 uuid, requests, &memory_handles, file_handles, sender_, io_runner_, |
| 61 file_runner_.get(), | |
| 62 base::Bind(&BlobMessageFilter::SendResponses, this, uuid), | |
| 63 base::Bind(&BlobMessageFilter::SendCancel, this, uuid)); | |
|
kinuko
2016/04/15 15:02:32
BlobTransportController already knows the concept
dmurph
2016/04/20 21:15:34
So you're saying we just give them a Send method c
| |
| 49 } | 64 } |
| 50 | 65 |
| 51 void BlobMessageFilter::OnCancelBuildingBlob( | 66 void BlobMessageFilter::OnCancelBuildingBlob( |
| 52 const std::string& uuid, | 67 const std::string& uuid, |
| 53 storage::IPCBlobCreationCancelCode code) { | 68 storage::IPCBlobCreationCancelCode code) { |
| 54 BlobTransportController::GetInstance()->OnCancel(uuid, code); | 69 BlobTransportController::GetInstance()->OnCancel(uuid, code); |
| 55 } | 70 } |
| 56 | 71 |
| 72 void BlobMessageFilter::SendResponses( | |
| 73 const std::string& uuid, | |
| 74 const std::vector<storage::BlobItemBytesResponse>& responses) { | |
| 75 if (sender_) | |
| 76 sender_->Send(new BlobStorageMsg_MemoryItemResponse(uuid, responses)); | |
| 77 } | |
| 78 void BlobMessageFilter::SendCancel(const std::string& uuid, | |
| 79 storage::IPCBlobCreationCancelCode code) { | |
| 80 if (sender_) | |
| 81 sender_->Send(new BlobStorageMsg_CancelBuildingBlob(uuid, code)); | |
|
kinuko
2016/04/15 15:02:32
Common pattern is that we have Send method that ch
dmurph
2016/04/20 21:15:34
Done.
| |
| 82 } | |
| 83 | |
| 57 void BlobMessageFilter::OnDoneBuildingBlob(const std::string& uuid) { | 84 void BlobMessageFilter::OnDoneBuildingBlob(const std::string& uuid) { |
| 58 BlobTransportController::GetInstance()->OnDone(uuid); | 85 BlobTransportController::GetInstance()->OnDone(uuid); |
| 59 } | 86 } |
| 60 | 87 |
| 61 } // namespace content | 88 } // namespace content |
| OLD | NEW |