diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/base/message_loop/message_loop.cc | |
parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/message_loop/message_loop.cc')
-rw-r--r-- | chromium/base/message_loop/message_loop.cc | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/chromium/base/message_loop/message_loop.cc b/chromium/base/message_loop/message_loop.cc index f60fd180641..2c8899bf05e 100644 --- a/chromium/base/message_loop/message_loop.cc +++ b/chromium/base/message_loop/message_loop.cc @@ -45,7 +45,7 @@ base::ThreadLocalPointer<MessageLoop>* GetTLSMessageLoop() { static auto* lazy_tls_ptr = new base::ThreadLocalPointer<MessageLoop>(); return lazy_tls_ptr; } -MessageLoop::MessagePumpFactory* message_pump_for_ui_factory_ = NULL; +MessageLoop::MessagePumpFactory* message_pump_for_ui_factory_ = nullptr; #if defined(OS_IOS) using MessagePumpForIO = MessagePumpIOSForIO; @@ -71,14 +71,11 @@ std::unique_ptr<MessagePump> ReturnPump(std::unique_ptr<MessagePump> pump) { //------------------------------------------------------------------------------ -MessageLoop::TaskObserver::TaskObserver() { -} +MessageLoop::TaskObserver::TaskObserver() = default; -MessageLoop::TaskObserver::~TaskObserver() { -} +MessageLoop::TaskObserver::~TaskObserver() = default; -MessageLoop::DestructionObserver::~DestructionObserver() { -} +MessageLoop::DestructionObserver::~DestructionObserver() = default; //------------------------------------------------------------------------------ @@ -136,9 +133,9 @@ MessageLoop::~MessageLoop() { // Tell the incoming queue that we are dying. incoming_task_queue_->WillDestroyCurrentMessageLoop(); - incoming_task_queue_ = NULL; - unbound_task_runner_ = NULL; - task_runner_ = NULL; + incoming_task_queue_ = nullptr; + unbound_task_runner_ = nullptr; + task_runner_ = nullptr; // OK, now make it so that no one can find us. if (current() == this) @@ -525,14 +522,6 @@ void MessageLoopForUI::Start() { static_cast<MessagePumpForUI*>(pump_.get())->Start(this); } -void MessageLoopForUI::StartForTesting( - base::android::JavaMessageHandlerFactory* factory, - WaitableEvent* test_done_event) { - // No Histogram support for UI message loop as it is managed by Java side - static_cast<MessagePumpForUI*>(pump_.get()) - ->StartForUnitTest(this, factory, test_done_event); -} - void MessageLoopForUI::Abort() { static_cast<MessagePumpForUI*>(pump_.get())->Abort(); } |