Index: blimp/engine/mojo/blob_channel_service.cc |
diff --git a/blimp/engine/mojo/blob_channel_service.cc b/blimp/engine/mojo/blob_channel_service.cc |
index c6dab89c76000bf1a2b22d07fb163d58f01df43e..12548e44487c1da7f4dd7ba78c6c78d7a892759c 100644 |
--- a/blimp/engine/mojo/blob_channel_service.cc |
+++ b/blimp/engine/mojo/blob_channel_service.cc |
@@ -10,24 +10,57 @@ |
#include <vector> |
#include "base/memory/ptr_util.h" |
+#include "base/task_runner_util.h" |
+#include "base/threading/thread.h" |
#include "blimp/net/blob_channel/blob_channel_sender.h" |
#include "mojo/public/cpp/system/buffer.h" |
namespace blimp { |
namespace engine { |
-BlobChannelService::BlobChannelService(BlobChannelSender* blob_channel_sender) |
- : blob_channel_sender_(blob_channel_sender) { |
- DCHECK(blob_channel_sender_); |
+BlobChannelService::BlobChannelService( |
+ base::WeakPtr<BlobChannelSender> blob_channel_sender, |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner) |
+ : blob_channel_sender_(blob_channel_sender), task_runner_(task_runner) { |
+ DCHECK(task_runner_.get()); |
} |
-BlobChannelService::~BlobChannelService() {} |
+BlobChannelService::~BlobChannelService() { |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
+} |
void BlobChannelService::GetCachedBlobIds( |
const BlobChannelService::GetCachedBlobIdsCallback& response_callback) { |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
VLOG(1) << "BlobChannel::GetCachedBlobIds called."; |
+ |
+ // Pull the list of blob IDs from the UI thread. |
+ base::PostTaskAndReplyWithResult( |
+ task_runner_.get(), |
+ FROM_HERE, |
+ base::Bind(&BlobChannelService::GetCachedBlobIdsOnUiThread, |
+ base::Unretained(this)), |
Wez
2016/08/19 19:15:50
What happens if you just Bind(BlobChannelSender::G
Kevin M
2016/08/19 21:43:33
There's a static assert that prevents one from Bin
Wez
2016/08/20 00:40:24
Awww, sad panda. But also yay for static asserts p
|
+ base::Bind(&BlobChannelService::ReceivedBlobIds, |
+ base::Unretained(this), |
+ response_callback)); |
Wez
2016/08/19 19:15:50
What prevents BlobChannelService being torn-down b
Kevin M
2016/08/19 21:43:33
Nothing... switched to WeakPtr and moved the UI th
|
+} |
+ |
+std::vector<BlobChannelSender::CacheStateEntry> |
+BlobChannelService::GetCachedBlobIdsOnUiThread() { |
Wez
2016/08/19 19:15:50
If we must have this method (i.e if Bind()ing dire
Kevin M
2016/08/19 21:43:33
Done.
|
+ DCHECK(task_runner_->BelongsToCurrentThread()); |
+ |
+ if (blob_channel_sender_) { |
+ return blob_channel_sender_->GetCachedBlobIds(); |
+ } else { |
+ return std::vector<BlobChannelSender::CacheStateEntry>(); |
+ } |
+} |
+ |
+void BlobChannelService::ReceivedBlobIds( |
+ const BlobChannelService::GetCachedBlobIdsCallback& response_callback, |
+ const std::vector<BlobChannelSender::CacheStateEntry>& ids) { |
std::unordered_map<std::string, bool> cache_state; |
- for (const auto& next_entry : blob_channel_sender_->GetCachedBlobIds()) { |
+ for (const auto& next_entry : ids) { |
CJ
2016/08/19 23:22:50
I'd suggest renaming |next_entry| to just entry, s
|
cache_state[next_entry.id] = next_entry.was_delivered; |
} |
response_callback.Run(std::move(cache_state)); |
@@ -36,6 +69,8 @@ void BlobChannelService::GetCachedBlobIds( |
void BlobChannelService::PutBlob(const std::string& id, |
mojo::ScopedSharedBufferHandle data, |
uint32_t size) { |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
+ |
// Map |data| into the address space and copy out its contents. |
if (!data.is_valid()) { |
LOG(ERROR) << "Invalid data handle received from renderer process."; |
@@ -52,15 +87,27 @@ void BlobChannelService::PutBlob(const std::string& id, |
scoped_refptr<BlobData> new_blob(new BlobData); |
new_blob->data.assign(reinterpret_cast<const char*>(mapping.get()), size); |
- blob_channel_sender_->PutBlob(id, std::move(new_blob)); |
+ |
+ task_runner_->PostTask(FROM_HERE, |
+ base::Bind(&BlobChannelSender::PutBlob, |
+ blob_channel_sender_, |
+ id, |
+ base::Passed(std::move(new_blob)))); |
} |
void BlobChannelService::DeliverBlob(const std::string& id) { |
- blob_channel_sender_->DeliverBlob(id); |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
+ |
+ task_runner_->PostTask(FROM_HERE, |
+ base::Bind(&BlobChannelSender::DeliverBlob, |
+ blob_channel_sender_, |
+ id)); |
} |
void BlobChannelService::BindRequest( |
mojo::InterfaceRequest<mojom::BlobChannel> request) { |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
+ |
bindings_.AddBinding(this, std::move(request)); |
} |