Commit 0d6b8919 authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Migrate MessageLoop::current() to MessageLoopCurrent in...

Migrate MessageLoop::current() to MessageLoopCurrent in /third_party/blink/renderer/platform/scheduler/child

These changes were scripted as part of the effort to restrict exposure of the
raw MessageLoop*.

Note that many static methods exposed on MessageLoopCurrent are also deprecated
so it is very well possible that this is migrating to an already deprecated
method.

The goal of this pass is to reduce usage of MessageLoop::current() (and
ultimately make it impossible to obtain the MessageLoop* statically).

As such I will not edit this CL unless the script did something logically wrong.
I defer to owners to fix highlighted usage of already deprecated APIs.

Possible script screw ups / things to look out for in this review:
 - Storing MessageLoopCurrent in a MessageLoop* variable or comparing it against
   one (I will go over that in a separate pass).

Includes should have been stripped if that was the last usage of message_loop.h
in that file.

Please CQ if LGTY

This CL was uploaded by git cl split.

R=rmcilroy@chromium.org

Bug: 825327
Change-Id: I4bbe57deb6fe22c898dcf4526ca5576bd461ef46
Reviewed-on: https://chromium-review.googlesource.com/1024295
Commit-Queue: Gabriel Charette <gab@chromium.org>
Commit-Queue: Alexander Timin <altimin@chromium.org>
Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552804}
parent ee99af18
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/location.h" #include "base/location.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_current.h"
#include "base/pending_task.h" #include "base/pending_task.h"
#include "base/threading/platform_thread.h" #include "base/threading/platform_thread.h"
#include "third_party/blink/public/platform/scheduler/single_thread_idle_task_runner.h" #include "third_party/blink/public/platform/scheduler/single_thread_idle_task_runner.h"
...@@ -78,12 +79,12 @@ void WebThreadBase::RemoveTaskTimeObserver( ...@@ -78,12 +79,12 @@ void WebThreadBase::RemoveTaskTimeObserver(
void WebThreadBase::AddTaskObserverInternal( void WebThreadBase::AddTaskObserverInternal(
base::MessageLoop::TaskObserver* observer) { base::MessageLoop::TaskObserver* observer) {
base::MessageLoop::current()->AddTaskObserver(observer); base::MessageLoopCurrent::Get()->AddTaskObserver(observer);
} }
void WebThreadBase::RemoveTaskObserverInternal( void WebThreadBase::RemoveTaskObserverInternal(
base::MessageLoop::TaskObserver* observer) { base::MessageLoop::TaskObserver* observer) {
base::MessageLoop::current()->RemoveTaskObserver(observer); base::MessageLoopCurrent::Get()->RemoveTaskObserver(observer);
} }
// static // static
......
...@@ -69,7 +69,7 @@ void WebThreadImplForWorkerScheduler::InitOnThread( ...@@ -69,7 +69,7 @@ void WebThreadImplForWorkerScheduler::InitOnThread(
new WebSchedulerImpl(non_main_thread_scheduler_.get(), new WebSchedulerImpl(non_main_thread_scheduler_.get(),
non_main_thread_scheduler_->IdleTaskRunner(), non_main_thread_scheduler_->IdleTaskRunner(),
non_main_thread_scheduler_->DefaultTaskQueue())); non_main_thread_scheduler_->DefaultTaskQueue()));
base::MessageLoop::current()->AddDestructionObserver(this); base::MessageLoopCurrent::Get()->AddDestructionObserver(this);
completion->Signal(); completion->Signal();
} }
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_WEBTHREAD_IMPL_FOR_WORKER_SCHEDULER_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_WEBTHREAD_IMPL_FOR_WORKER_SCHEDULER_H_
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_current.h"
#include "base/synchronization/atomic_flag.h" #include "base/synchronization/atomic_flag.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "third_party/blink/public/platform/scheduler/child/webthread_base.h" #include "third_party/blink/public/platform/scheduler/child/webthread_base.h"
...@@ -29,7 +30,7 @@ class WorkerSchedulerProxy; ...@@ -29,7 +30,7 @@ class WorkerSchedulerProxy;
class PLATFORM_EXPORT WebThreadImplForWorkerScheduler class PLATFORM_EXPORT WebThreadImplForWorkerScheduler
: public WebThreadBase, : public WebThreadBase,
public base::MessageLoop::DestructionObserver { public base::MessageLoopCurrent::DestructionObserver {
public: public:
explicit WebThreadImplForWorkerScheduler( explicit WebThreadImplForWorkerScheduler(
const WebThreadCreationParams& params); const WebThreadCreationParams& params);
...@@ -44,7 +45,7 @@ class PLATFORM_EXPORT WebThreadImplForWorkerScheduler ...@@ -44,7 +45,7 @@ class PLATFORM_EXPORT WebThreadImplForWorkerScheduler
scheduler::SingleThreadIdleTaskRunner* GetIdleTaskRunner() const override; scheduler::SingleThreadIdleTaskRunner* GetIdleTaskRunner() const override;
void Init() override; void Init() override;
// base::MessageLoop::DestructionObserver implementation. // base::MessageLoopCurrent::DestructionObserver implementation.
void WillDestroyCurrentMessageLoop() override; void WillDestroyCurrentMessageLoop() override;
scheduler::NonMainThreadScheduler* GetNonMainThreadScheduler() { scheduler::NonMainThreadScheduler* GetNonMainThreadScheduler() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment