Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "headless/lib/browser/headless_tab_socket_impl.h" | |
| 6 | |
| 7 namespace headless { | |
| 8 | |
| 9 HeadlessTabSocketImpl::HeadlessTabSocketImpl() : listener_(nullptr) {} | |
| 10 | |
| 11 HeadlessTabSocketImpl::~HeadlessTabSocketImpl() {} | |
| 12 | |
| 13 void HeadlessTabSocketImpl::SendMessageToTab(const std::string& message) { | |
| 14 base::AutoLock lock(lock_); | |
| 15 if (waiting_for_message_cb_.is_null() || !out_going_message_queue_.empty()) { | |
| 16 out_going_message_queue_.push_back(message); | |
| 17 } else { | |
| 18 waiting_for_message_cb_.Run(message); | |
|
Sami
2017/04/12 14:18:45
Ditto about locking.
alex clarke (OOO till 29th)
2017/04/12 15:47:46
Done.
| |
| 19 waiting_for_message_cb_ = AwaitNextMessageFromEmbedderCallback(); | |
| 20 DCHECK(waiting_for_message_cb_.is_null()); | |
| 21 } | |
| 22 } | |
| 23 | |
| 24 void HeadlessTabSocketImpl::SetListener(Listener* listener) { | |
| 25 base::AutoLock lock(lock_); | |
| 26 listener_ = listener; | |
| 27 if (!listener) | |
| 28 return; | |
| 29 | |
| 30 for (const std::string& message : incomming_message_queue_) { | |
| 31 listener_->OnMessageFromTab(message); | |
|
Sami
2017/04/12 14:18:45
Could we do this outside the lock? Otherwise you c
alex clarke (OOO till 29th)
2017/04/12 15:47:46
Done.
Sami
2017/04/12 16:09:06
Looks like we're still holding the lock here?
alex clarke (OOO till 29th)
2017/04/12 19:41:48
Oops done.
| |
| 32 } | |
| 33 incomming_message_queue_.clear(); | |
| 34 } | |
| 35 | |
| 36 void HeadlessTabSocketImpl::SendMessageToEmbedder(const std::string& message) { | |
| 37 base::AutoLock lock(lock_); | |
| 38 if (listener_) { | |
| 39 listener_->OnMessageFromTab(message); | |
| 40 } else { | |
| 41 incomming_message_queue_.push_back(message); | |
| 42 } | |
| 43 } | |
| 44 | |
| 45 void HeadlessTabSocketImpl::AwaitNextMessageFromEmbedder( | |
| 46 const AwaitNextMessageFromEmbedderCallback& callback) { | |
| 47 base::AutoLock lock(lock_); | |
| 48 if (out_going_message_queue_.empty()) { | |
| 49 waiting_for_message_cb_ = callback; | |
| 50 DCHECK(!waiting_for_message_cb_.is_null()); | |
| 51 } else { | |
| 52 callback.Run(out_going_message_queue_.front()); | |
|
Sami
2017/04/12 14:18:45
Ditto about locking.
alex clarke (OOO till 29th)
2017/04/12 15:47:46
Done.
| |
| 53 out_going_message_queue_.pop_front(); | |
| 54 } | |
| 55 } | |
| 56 | |
| 57 void HeadlessTabSocketImpl::CreateMojoService( | |
| 58 mojo::InterfaceRequest<TabSocket> request) { | |
| 59 mojo_bindings_.AddBinding(this, std::move(request)); | |
| 60 } | |
| 61 | |
| 62 } // namespace headless | |
| OLD | NEW |