| Index: third_party/WebKit/Source/platform/scheduler/child/webthread_base.cc
|
| diff --git a/components/scheduler/child/webthread_base.cc b/third_party/WebKit/Source/platform/scheduler/child/webthread_base.cc
|
| similarity index 79%
|
| rename from components/scheduler/child/webthread_base.cc
|
| rename to third_party/WebKit/Source/platform/scheduler/child/webthread_base.cc
|
| index cf2ea07635c46e8201f07a54549c3569df97a759..c27706f13978a9a3cf90ebb6c4b96e6e6b046a9f 100644
|
| --- a/components/scheduler/child/webthread_base.cc
|
| +++ b/third_party/WebKit/Source/platform/scheduler/child/webthread_base.cc
|
| @@ -5,16 +5,17 @@
|
| // An implementation of WebThread in terms of base::MessageLoop and
|
| // base::Thread
|
|
|
| -#include "components/scheduler/child/webthread_base.h"
|
| +#include "public/platform/scheduler/child/webthread_base.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/pending_task.h"
|
| #include "base/threading/platform_thread.h"
|
| -#include "components/scheduler/child/single_thread_idle_task_runner.h"
|
| -#include "third_party/WebKit/public/platform/WebTraceLocation.h"
|
| +#include "public/platform/scheduler/child/single_thread_idle_task_runner.h"
|
| +#include "public/platform/WebTraceLocation.h"
|
|
|
| +namespace blink {
|
| namespace scheduler {
|
|
|
| class WebThreadBase::TaskObserverAdapter
|
| @@ -35,8 +36,7 @@ class WebThreadBase::TaskObserverAdapter
|
| WebThread::TaskObserver* observer_;
|
| };
|
|
|
| -WebThreadBase::WebThreadBase() {
|
| -}
|
| +WebThreadBase::WebThreadBase() {}
|
|
|
| WebThreadBase::~WebThreadBase() {
|
| for (auto& observer_entry : task_observer_map_) {
|
| @@ -46,8 +46,8 @@ WebThreadBase::~WebThreadBase() {
|
|
|
| void WebThreadBase::addTaskObserver(TaskObserver* observer) {
|
| CHECK(isCurrentThread());
|
| - std::pair<TaskObserverMap::iterator, bool> result = task_observer_map_.insert(
|
| - std::make_pair(observer, nullptr));
|
| + std::pair<TaskObserverMap::iterator, bool> result =
|
| + task_observer_map_.insert(std::make_pair(observer, nullptr));
|
| if (result.second)
|
| result.first->second = new TaskObserverAdapter(observer);
|
| AddTaskObserverInternal(result.first->second);
|
| @@ -83,18 +83,16 @@ void WebThreadBase::RunWebThreadIdleTask(
|
| void WebThreadBase::postIdleTask(const blink::WebTraceLocation& location,
|
| IdleTask* idle_task) {
|
| GetIdleTaskRunner()->PostIdleTask(
|
| - location,
|
| - base::Bind(&WebThreadBase::RunWebThreadIdleTask,
|
| - base::Passed(base::WrapUnique(idle_task))));
|
| + location, base::Bind(&WebThreadBase::RunWebThreadIdleTask,
|
| + base::Passed(base::WrapUnique(idle_task))));
|
| }
|
|
|
| void WebThreadBase::postIdleTaskAfterWakeup(
|
| const blink::WebTraceLocation& location,
|
| IdleTask* idle_task) {
|
| GetIdleTaskRunner()->PostIdleTaskAfterWakeup(
|
| - location,
|
| - base::Bind(&WebThreadBase::RunWebThreadIdleTask,
|
| - base::Passed(base::WrapUnique(idle_task))));
|
| + location, base::Bind(&WebThreadBase::RunWebThreadIdleTask,
|
| + base::Passed(base::WrapUnique(idle_task))));
|
| }
|
|
|
| bool WebThreadBase::isCurrentThread() const {
|
| @@ -102,3 +100,4 @@ bool WebThreadBase::isCurrentThread() const {
|
| }
|
|
|
| } // namespace scheduler
|
| +} // namespace blink
|
|
|