Move common scheduler classes from child/ to common/.
This patch moves CancelableClosureHoler, IdleCanceledDelayedTaskSweeper
and IdleHelper from scheduler/child/ to scheduler/common/. The child/
directory is now obsolete. These classes are for both main thread and
non-main thread schedulers, so they should be used to common/.
Bug: 826203
Change-Id: I967f922084c59b191ae127209e10127c17e9bbc7
Reviewed-on: https://chromium-review.googlesource.com/1084400
Commit-Queue: Yuta Kitamura <yutak@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564393}diff --git a/third_party/blink/renderer/platform/scheduler/BUILD.gn b/third_party/blink/renderer/platform/scheduler/BUILD.gn
index 8ffba4f..7ba0ab7 100644
--- a/third_party/blink/renderer/platform/scheduler/BUILD.gn
+++ b/third_party/blink/renderer/platform/scheduler/BUILD.gn
@@ -36,14 +36,8 @@
"base/work_queue.h",
"base/work_queue_sets.cc",
"base/work_queue_sets.h",
- "child/cancelable_closure_holder.cc",
- "child/cancelable_closure_holder.h",
"child/default_params.h",
"child/features.h",
- "child/idle_canceled_delayed_task_sweeper.cc",
- "child/idle_canceled_delayed_task_sweeper.h",
- "child/idle_helper.cc",
- "child/idle_helper.h",
"child/page_visibility_state.cc",
"child/page_visibility_state.h",
"child/pollable_thread_safe_flag.cc",
@@ -56,7 +50,13 @@
"child/webthread_base.cc",
"child/webthread_impl_for_worker_scheduler.cc",
"child/webthread_impl_for_worker_scheduler.h",
+ "common/cancelable_closure_holder.cc",
+ "common/cancelable_closure_holder.h",
"common/frame_or_worker_scheduler.cc",
+ "common/idle_canceled_delayed_task_sweeper.cc",
+ "common/idle_canceled_delayed_task_sweeper.h",
+ "common/idle_helper.cc",
+ "common/idle_helper.h",
"common/metrics_helper.cc",
"common/metrics_helper.h",
"common/scheduler_helper.cc",
@@ -196,9 +196,9 @@
"base/time_domain_unittest.cc",
"base/work_queue_sets_unittest.cc",
"base/work_queue_unittest.cc",
- "child/idle_canceled_delayed_task_sweeper_unittest.cc",
- "child/idle_helper_unittest.cc",
"child/webthread_impl_for_worker_scheduler_unittest.cc",
+ "common/idle_canceled_delayed_task_sweeper_unittest.cc",
+ "common/idle_helper_unittest.cc",
"common/metrics_helper_unittest.cc",
"common/scheduler_helper_unittest.cc",
"common/throttling/budget_pool_unittest.cc",
diff --git a/third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.cc b/third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.cc
similarity index 89%
rename from third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.cc
rename to third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.cc
index 9264b36..5abf560 100644
--- a/third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.h"
+#include "third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h"
namespace blink {
namespace scheduler {
diff --git a/third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.h b/third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h
similarity index 80%
rename from third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.h
rename to third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h
index a8b484c..a070892 100644
--- a/third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.h
+++ b/third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_CANCELABLE_CLOSURE_HOLDER_H_
-#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_CANCELABLE_CLOSURE_HOLDER_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_CANCELABLE_CLOSURE_HOLDER_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_CANCELABLE_CLOSURE_HOLDER_H_
#include "base/cancelable_callback.h"
#include "base/macros.h"
@@ -39,4 +39,4 @@
} // namespace scheduler
} // namespace blink
-#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_CANCELABLE_CLOSURE_HOLDER_H_
+#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_CANCELABLE_CLOSURE_HOLDER_H_
diff --git a/third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.cc b/third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.cc
similarity index 92%
rename from third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.cc
rename to third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.cc
index 2d6a816..41ab99b 100644
--- a/third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.h"
#include "base/bind.h"
diff --git a/third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.h b/third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.h
similarity index 78%
rename from third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.h
rename to third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.h
index 2e7da89..def21936 100644
--- a/third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.h
+++ b/third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_IDLE_CANCELED_DELAYED_TASK_SWEEPER_H_
-#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_IDLE_CANCELED_DELAYED_TASK_SWEEPER_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_IDLE_CANCELED_DELAYED_TASK_SWEEPER_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_IDLE_CANCELED_DELAYED_TASK_SWEEPER_H_
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -35,4 +35,4 @@
} // namespace scheduler
} // namespace blink
-#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_IDLE_CANCELED_DELAYED_TASK_SWEEPER_H_
+#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_IDLE_CANCELED_DELAYED_TASK_SWEEPER_H_
diff --git a/third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper_unittest.cc
similarity index 96%
rename from third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper_unittest.cc
rename to third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper_unittest.cc
index 00779df..e29e289 100644
--- a/third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.h"
#include "base/task/sequence_manager/lazy_now.h"
#include "base/test/simple_test_tick_clock.h"
@@ -10,7 +10,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
#include "third_party/blink/renderer/platform/scheduler/base/test/task_queue_manager_for_test.h"
-#include "third_party/blink/renderer/platform/scheduler/child/idle_helper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_helper.h"
#include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"
#include "third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_helper.h"
diff --git a/third_party/blink/renderer/platform/scheduler/child/idle_helper.cc b/third_party/blink/renderer/platform/scheduler/common/idle_helper.cc
similarity index 99%
rename from third_party/blink/renderer/platform/scheduler/child/idle_helper.cc
rename to third_party/blink/renderer/platform/scheduler/common/idle_helper.cc
index 11947de..a585657 100644
--- a/third_party/blink/renderer/platform/scheduler/child/idle_helper.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/idle_helper.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/blink/renderer/platform/scheduler/child/idle_helper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_helper.h"
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
diff --git a/third_party/blink/renderer/platform/scheduler/child/idle_helper.h b/third_party/blink/renderer/platform/scheduler/common/idle_helper.h
similarity index 96%
rename from third_party/blink/renderer/platform/scheduler/child/idle_helper.h
rename to third_party/blink/renderer/platform/scheduler/common/idle_helper.h
index ea5ac0a..c14ed39 100644
--- a/third_party/blink/renderer/platform/scheduler/child/idle_helper.h
+++ b/third_party/blink/renderer/platform/scheduler/common/idle_helper.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_IDLE_HELPER_H_
-#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_IDLE_HELPER_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_IDLE_HELPER_H_
+#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_IDLE_HELPER_H_
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -11,7 +11,7 @@
#include "third_party/blink/public/platform/scheduler/single_thread_idle_task_runner.h"
#include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/scheduler/base/task_queue_selector.h"
-#include "third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.h"
+#include "third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h"
#include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"
namespace blink {
@@ -248,4 +248,4 @@
} // namespace scheduler
} // namespace blink
-#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_CHILD_IDLE_HELPER_H_
+#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_COMMON_IDLE_HELPER_H_
diff --git a/third_party/blink/renderer/platform/scheduler/child/idle_helper_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/idle_helper_unittest.cc
similarity index 99%
rename from third_party/blink/renderer/platform/scheduler/child/idle_helper_unittest.cc
rename to third_party/blink/renderer/platform/scheduler/common/idle_helper_unittest.cc
index 1a6d650b..04e5453 100644
--- a/third_party/blink/renderer/platform/scheduler/child/idle_helper_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/idle_helper_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/blink/renderer/platform/scheduler/child/idle_helper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_helper.h"
#include <utility>
@@ -459,9 +459,9 @@
ON_CALL(*idle_helper_, OnIdlePeriodStarted())
.WillByDefault(
Invoke([fixture]() { EXPECT_TRUE(fixture->IsInIdlePeriod()); }));
- ON_CALL(*idle_helper_, OnIdlePeriodEnded())
- .WillByDefault(
- Invoke([fixture]() { EXPECT_FALSE(fixture->IsInIdlePeriod()); }));
+ ON_CALL(*idle_helper_, OnIdlePeriodEnded()).WillByDefault(Invoke([fixture]() {
+ EXPECT_FALSE(fixture->IsInIdlePeriod());
+ }));
ExpectIdlePeriodStartsAndEnds(Exactly(1));
diff --git a/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler.h b/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler.h
index 11d1b5612..34a5b3cb 100644
--- a/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler.h
+++ b/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler.h
@@ -16,7 +16,7 @@
#include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
#include "third_party/blink/renderer/platform/scheduler/base/time_domain.h"
-#include "third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.h"
+#include "third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h"
#include "third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool.h"
#include "third_party/blink/renderer/platform/scheduler/common/throttling/cpu_time_budget_pool.h"
#include "third_party/blink/renderer/platform/scheduler/common/throttling/wake_up_budget_pool.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner.h b/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner.h
index 2cf9c70a..a59ef9a 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner.h
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner.h
@@ -10,7 +10,7 @@
#include "base/single_thread_task_runner.h"
#include "base/time/time.h"
#include "third_party/blink/renderer/platform/platform_export.h"
-#include "third_party/blink/renderer/platform/scheduler/child/cancelable_closure_holder.h"
+#include "third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h"
namespace blink {
namespace scheduler {
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h
index 8d74174..ef8fe22 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h
@@ -25,10 +25,10 @@
#include "third_party/blink/renderer/platform/platform_export.h"
#include "third_party/blink/renderer/platform/scheduler/base/task_queue.h"
#include "third_party/blink/renderer/platform/scheduler/base/task_time_observer.h"
-#include "third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.h"
-#include "third_party/blink/renderer/platform/scheduler/child/idle_helper.h"
#include "third_party/blink/renderer/platform/scheduler/child/pollable_thread_safe_flag.h"
#include "third_party/blink/renderer/platform/scheduler/child/task_queue_with_task_type.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_helper.h"
#include "third_party/blink/renderer/platform/scheduler/common/thread_scheduler_impl.h"
#include "third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain.h"
#include "third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner.h"
diff --git a/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler.h b/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler.h
index f0af2d2..71b74cc 100644
--- a/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler.h
+++ b/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler.h
@@ -10,8 +10,8 @@
#include "base/single_thread_task_runner.h"
#include "third_party/blink/public/platform/web_thread_type.h"
#include "third_party/blink/renderer/platform/scheduler/base/task_time_observer.h"
-#include "third_party/blink/renderer/platform/scheduler/child/idle_canceled_delayed_task_sweeper.h"
-#include "third_party/blink/renderer/platform/scheduler/child/idle_helper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_canceled_delayed_task_sweeper.h"
+#include "third_party/blink/renderer/platform/scheduler/common/idle_helper.h"
#include "third_party/blink/renderer/platform/scheduler/public/frame_scheduler.h"
#include "third_party/blink/renderer/platform/scheduler/util/task_duration_metric_reporter.h"
#include "third_party/blink/renderer/platform/scheduler/util/thread_load_tracker.h"
