diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
| commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
| tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/dbus/object_proxy.cc | |
| parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
| download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz | |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/dbus/object_proxy.cc')
| -rw-r--r-- | chromium/dbus/object_proxy.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromium/dbus/object_proxy.cc b/chromium/dbus/object_proxy.cc index 3046dbb5f38..1914a8d1b6f 100644 --- a/chromium/dbus/object_proxy.cc +++ b/chromium/dbus/object_proxy.cc @@ -16,6 +16,7 @@ #include "base/strings/stringprintf.h" #include "base/task_runner.h" #include "base/task_runner_util.h" +#include "base/threading/scoped_blocking_call.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "dbus/bus.h" @@ -302,6 +303,9 @@ void ObjectProxy::Detach() { match_rules_.clear(); for (auto* pending_call : pending_calls_) { + base::ScopedBlockingCall scoped_blocking_call( + base::BlockingType::MAY_BLOCK); + dbus_pending_call_cancel(pending_call); dbus_pending_call_unref(pending_call); } @@ -313,6 +317,7 @@ void ObjectProxy::StartAsyncMethodCall(int timeout_ms, ReplyCallbackHolder callback_holder, base::TimeTicks start_time) { bus_->AssertOnDBusThread(); + base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK); if (!bus_->Connect() || !bus_->SetUpAsyncOperations()) { // In case of a failure, run the error callback with nullptr. @@ -353,6 +358,7 @@ void ObjectProxy::OnPendingCallIsComplete(ReplyCallbackHolder callback_holder, base::TimeTicks start_time, DBusPendingCall* pending_call) { bus_->AssertOnDBusThread(); + base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK); DBusMessage* response_message = dbus_pending_call_steal_reply(pending_call); |