diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/base/message_loop/message_loop.cc | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/base/message_loop/message_loop.cc')
| -rw-r--r-- | chromium/base/message_loop/message_loop.cc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/chromium/base/message_loop/message_loop.cc b/chromium/base/message_loop/message_loop.cc index a51db8ba54e..028cf9f8d95 100644 --- a/chromium/base/message_loop/message_loop.cc +++ b/chromium/base/message_loop/message_loop.cc @@ -85,7 +85,7 @@ MessageLoop::MessageLoop(Type type) } MessageLoop::MessageLoop(std::unique_ptr<MessagePump> pump) - : MessageLoop(TYPE_CUSTOM, BindOnce(&ReturnPump, Passed(&pump))) { + : MessageLoop(TYPE_CUSTOM, BindOnce(&ReturnPump, std::move(pump))) { BindToCurrentThread(); } @@ -180,15 +180,6 @@ std::unique_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) { #define MESSAGE_PUMP_UI std::unique_ptr<MessagePump>(new MessagePumpForUI()) #endif -#if defined(OS_MACOSX) - // Use an OS native runloop on Mac to support timer coalescing. -#define MESSAGE_PUMP_DEFAULT \ - std::unique_ptr<MessagePump>(new MessagePumpCFRunLoop()) -#else -#define MESSAGE_PUMP_DEFAULT \ - std::unique_ptr<MessagePump>(new MessagePumpDefault()) -#endif - if (type == MessageLoop::TYPE_UI) { if (message_pump_for_ui_factory_) return message_pump_for_ui_factory_(); @@ -203,7 +194,12 @@ std::unique_ptr<MessagePump> MessageLoop::CreateMessagePumpForType(Type type) { #endif DCHECK_EQ(MessageLoop::TYPE_DEFAULT, type); - return MESSAGE_PUMP_DEFAULT; +#if defined(OS_IOS) + // On iOS, a native runloop is always required to pump system work. + return std::make_unique<MessagePumpCFRunLoop>(); +#else + return std::make_unique<MessagePumpDefault>(); +#endif } void MessageLoop::AddDestructionObserver( |