OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "blimp/engine/mojo/blob_channel_service.h" | 5 #include "blimp/engine/mojo/blob_channel_service.h" |
6 | 6 |
7 #include "blimp/net/blob_channel/blob_channel_sender.h" | 7 #include "blimp/net/blob_channel/blob_channel_sender.h" |
8 #include "mojo/public/cpp/system/buffer.h" | |
8 | 9 |
9 namespace blimp { | 10 namespace blimp { |
10 namespace engine { | 11 namespace engine { |
11 | 12 |
12 BlobChannelService::BlobChannelService(BlobChannelSender* blob_channel_sender, | 13 BlobChannelService::BlobChannelService(BlobChannelSender* blob_channel_sender, |
13 mojom::BlobChannelRequest request) | 14 mojom::BlobChannelRequest request) |
14 : binding_(this, std::move(request)), | 15 : binding_(this, std::move(request)), |
15 blob_channel_sender_(blob_channel_sender) { | 16 blob_channel_sender_(blob_channel_sender) { |
16 DCHECK(blob_channel_sender_); | 17 DCHECK(blob_channel_sender_); |
17 } | 18 } |
18 | 19 |
19 BlobChannelService::~BlobChannelService() {} | 20 BlobChannelService::~BlobChannelService() {} |
20 | 21 |
21 void BlobChannelService::PutBlob(const mojo::String& id, | 22 void BlobChannelService::PutBlob(const mojo::String& id, |
22 const mojo::String& data) { | 23 mojo::ScopedSharedBufferHandle data, |
23 blob_channel_sender_->PutBlob(id, new BlobData(data)); | 24 uint32_t size) { |
25 // Map |data| into the address space and copy out its contents. | |
26 if (!data.is_valid()) { | |
27 LOG(ERROR) << "Invalid data handle received from renderer process."; | |
Wez
2016/07/01 01:06:56
Not for this CL: We should work out how in general
Kevin M
2016/07/18 16:35:16
Filed crbug.com/629096
| |
28 return; | |
29 } | |
30 | |
31 if (size > kMaxBlobSizeBytes) { | |
32 LOG(ERROR) << "Blob size too big: " << size; | |
33 return; | |
34 } | |
35 | |
36 scoped_refptr<BlobData> new_blob(new BlobData); | |
37 auto mapping = data->Map(size); | |
Wez
2016/07/01 01:06:56
nit: Don't use auto here, since it's not obvious t
dcheng
2016/07/01 02:04:28
I missed this, but we need to check that the Map()
Kevin M
2016/07/18 16:35:16
Done.
Kevin M
2016/07/18 16:35:16
Done.
| |
38 new_blob->data.assign(reinterpret_cast<const char*>(mapping.get()), size); | |
39 blob_channel_sender_->PutBlob(id, std::move(new_blob)); | |
24 } | 40 } |
25 | 41 |
26 void BlobChannelService::DeliverBlob(const mojo::String& id) { | 42 void BlobChannelService::DeliverBlob(const mojo::String& id) { |
27 blob_channel_sender_->DeliverBlob(id); | 43 blob_channel_sender_->DeliverBlob(id); |
28 } | 44 } |
29 | 45 |
30 // static | 46 // static |
31 void BlobChannelService::Create( | 47 void BlobChannelService::Create( |
32 BlobChannelSender* blob_channel_sender, | 48 BlobChannelSender* blob_channel_sender, |
33 mojo::InterfaceRequest<mojom::BlobChannel> request) { | 49 mojo::InterfaceRequest<mojom::BlobChannel> request) { |
34 // Object lifetime is managed by BlobChannelService's StrongBinding | 50 // Object lifetime is managed by BlobChannelService's StrongBinding |
35 // |binding_|. | 51 // |binding_|. |
36 new BlobChannelService(blob_channel_sender, std::move(request)); | 52 new BlobChannelService(blob_channel_sender, std::move(request)); |
37 } | 53 } |
38 | 54 |
39 } // namespace engine | 55 } // namespace engine |
40 } // namespace blimp | 56 } // namespace blimp |
OLD | NEW |