aboutsummaryrefslogtreecommitdiff
path: root/mojo/edk/js/waiting_callback.cc
diff options
context:
space:
mode:
authorHidehiko Abe <hidehiko@google.com>2018-04-19 20:42:46 +0900
committerHidehiko Abe <hidehiko@google.com>2018-04-20 11:11:59 +0900
commit991e618ea063cc28060d6baa0c0d6ffa3ad29452 (patch)
treed7c62aca68333ccc7dc58e356d515dd01c734a7f /mojo/edk/js/waiting_callback.cc
parent1e4a1e50aed7593adac78af6f319adb67f03d7bb (diff)
downloadlibmojo-991e618ea063cc28060d6baa0c0d6ffa3ad29452.tar.gz
Uprev libmojo to r462023.
To be aligned with libchrome. Highlights of the update: - r461016: Support sync calls through ThreadSafeInterfacePtr - r458684: mojo: MessageReceiver*::AcceptWithResponder() now take a unique_ptr to the responder - r458630: Mojo C++ Bindings: Support dispatch in nested message loops - r457994: Mojo C++ bindings: rename GetIsolatedProxy to MakeIsolatedRequest to better match other functions. - r457856: Mojo: Move waiting APIs to public library - r457378: Introduce MojoQueryHandleSignalsState API Bug: 73606903 Test: Built locally. Run on DUT. Change-Id: Id3e2f5262eb97345ed2e6b597157d594cb8b4110
Diffstat (limited to 'mojo/edk/js/waiting_callback.cc')
-rw-r--r--mojo/edk/js/waiting_callback.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/edk/js/waiting_callback.cc b/mojo/edk/js/waiting_callback.cc
index fada039..6ad4bd0 100644
--- a/mojo/edk/js/waiting_callback.cc
+++ b/mojo/edk/js/waiting_callback.cc
@@ -32,7 +32,7 @@ gin::Handle<WaitingCallback> WaitingCallback::Create(
bool one_shot) {
gin::Handle<WaitingCallback> waiting_callback = gin::CreateHandle(
isolate, new WaitingCallback(isolate, callback, one_shot));
- MojoResult result = waiting_callback->watcher_.Start(
+ MojoResult result = waiting_callback->watcher_.Watch(
handle_wrapper->get(), signals,
base::Bind(&WaitingCallback::OnHandleReady,
base::Unretained(waiting_callback.get())));
@@ -53,7 +53,7 @@ WaitingCallback::WaitingCallback(v8::Isolate* isolate,
v8::Handle<v8::Function> callback,
bool one_shot)
: one_shot_(one_shot),
- watcher_(FROM_HERE),
+ watcher_(FROM_HERE, SimpleWatcher::ArmingPolicy::AUTOMATIC),
weak_factory_(this) {
v8::Handle<v8::Context> context = isolate->GetCurrentContext();
runner_ = gin::PerContextData::From(context)->runner()->GetWeakPtr();