Commit 746f1745 authored by Katie Dillon's avatar Katie Dillon Committed by Commit Bot

[scheduling] Remove QueueType::kUnthrottled.

This QueueType is unused.

Change-Id: I1282a6edd341acd8530993341e2026f19108f186
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2305034Reviewed-by: default avatarScott Haseley <shaseley@chromium.org>
Commit-Queue: Katie Dillon <kdillon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791329}
parent 2c949d86
......@@ -284,9 +284,6 @@ TEST_F(MainThreadMetricsHelperTest, Metrics_PerQueueType) {
RunTask(QueueType::kFrameThrottleable,
start + base::TimeDelta::FromSeconds(28 + kCoolingOfTimeSeconds),
base::TimeDelta::FromSeconds(8));
RunTask(QueueType::kUnthrottled,
start + base::TimeDelta::FromSeconds(38 + kCoolingOfTimeSeconds),
base::TimeDelta::FromSeconds(5));
RunTask(QueueType::kFrameLoading,
start + base::TimeDelta::FromSeconds(45 + kCoolingOfTimeSeconds),
base::TimeDelta::FromSeconds(10));
......@@ -322,7 +319,6 @@ TEST_F(MainThreadMetricsHelperTest, Metrics_PerQueueType) {
std::vector<base::Bucket> expected_samples = {
{static_cast<int>(QueueType::kControl), 11},
{static_cast<int>(QueueType::kDefault), 2},
{static_cast<int>(QueueType::kUnthrottled), 5},
{static_cast<int>(QueueType::kFrameLoading), 16},
{static_cast<int>(QueueType::kCompositor), 22},
{static_cast<int>(QueueType::kIdle), 20},
......@@ -350,7 +346,6 @@ TEST_F(MainThreadMetricsHelperTest, Metrics_PerQueueType) {
"RendererScheduler.TaskDurationPerQueueType3.Background"),
UnorderedElementsAre(
Bucket(static_cast<int>(QueueType::kControl), 8),
Bucket(static_cast<int>(QueueType::kUnthrottled), 5),
Bucket(static_cast<int>(QueueType::kFrameLoading), 10),
Bucket(static_cast<int>(QueueType::kFrameThrottleable), 19),
Bucket(static_cast<int>(QueueType::kFramePausable), 17),
......
......@@ -487,6 +487,14 @@ class MainThreadSchedulerImplTest : public testing::Test {
.get();
}
scoped_refptr<MainThreadTaskQueue> NewUnpausableTaskQueue() {
return scheduler_->NewTaskQueue(
MainThreadTaskQueue::QueueCreationParams(
MainThreadTaskQueue::QueueType::kFrameUnpausable)
.SetQueueTraits(
main_frame_scheduler_->UnpausableTaskQueueTraits()));
}
void TearDown() override {
widget_scheduler_.reset();
main_frame_scheduler_.reset();
......@@ -3051,9 +3059,7 @@ TEST_F(MainThreadSchedulerImplTest, UnthrottledTaskRunner) {
// Ensure neither suspension nor timer task throttling affects an unthrottled
// task runner.
SimulateCompositorGestureStart(TouchEventPolicy::kSendTouchStart);
scoped_refptr<TaskQueue> unthrottled_task_queue =
scheduler_->NewTaskQueue(MainThreadTaskQueue::QueueCreationParams(
MainThreadTaskQueue::QueueType::kUnthrottled));
scoped_refptr<TaskQueue> unthrottled_task_queue = NewUnpausableTaskQueue();
size_t timer_count = 0;
size_t unthrottled_count = 0;
......@@ -3113,9 +3119,7 @@ TEST_F(MainThreadSchedulerImplTest, EnableVirtualTime) {
MainThreadTaskQueue::QueueType::kFrameLoadingControl, nullptr);
scoped_refptr<MainThreadTaskQueue> timer_tq = scheduler_->NewTimerTaskQueue(
MainThreadTaskQueue::QueueType::kFrameThrottleable, nullptr);
scoped_refptr<MainThreadTaskQueue> unthrottled_tq =
scheduler_->NewTaskQueue(MainThreadTaskQueue::QueueCreationParams(
MainThreadTaskQueue::QueueType::kUnthrottled));
scoped_refptr<MainThreadTaskQueue> unthrottled_tq = NewUnpausableTaskQueue();
EXPECT_EQ(scheduler_->DefaultTaskQueue()->GetTimeDomain(),
scheduler_->GetVirtualTimeDomain());
......@@ -3151,10 +3155,7 @@ TEST_F(MainThreadSchedulerImplTest, EnableVirtualTime) {
MainThreadTaskQueue::QueueType::kFrameThrottleable, nullptr)
->GetTimeDomain(),
scheduler_->GetVirtualTimeDomain());
EXPECT_EQ(scheduler_
->NewTaskQueue(MainThreadTaskQueue::QueueCreationParams(
MainThreadTaskQueue::QueueType::kUnthrottled))
->GetTimeDomain(),
EXPECT_EQ(NewUnpausableTaskQueue()->GetTimeDomain(),
scheduler_->GetVirtualTimeDomain());
EXPECT_EQ(scheduler_
->NewTaskQueue(MainThreadTaskQueue::QueueCreationParams(
......@@ -3188,9 +3189,7 @@ TEST_F(MainThreadSchedulerImplTest, DisableVirtualTimeForTesting) {
scoped_refptr<MainThreadTaskQueue> timer_tq = scheduler_->NewTimerTaskQueue(
MainThreadTaskQueue::QueueType::kFrameThrottleable, nullptr);
scoped_refptr<MainThreadTaskQueue> unthrottled_tq =
scheduler_->NewTaskQueue(MainThreadTaskQueue::QueueCreationParams(
MainThreadTaskQueue::QueueType::kUnthrottled));
scoped_refptr<MainThreadTaskQueue> unthrottled_tq = NewUnpausableTaskQueue();
scheduler_->DisableVirtualTimeForTesting();
EXPECT_EQ(scheduler_->DefaultTaskQueue()->GetTimeDomain(),
......
......@@ -29,8 +29,6 @@ const char* MainThreadTaskQueue::NameForQueueType(
return "control_tq";
case MainThreadTaskQueue::QueueType::kDefault:
return "default_tq";
case MainThreadTaskQueue::QueueType::kUnthrottled:
return "unthrottled_tq";
case MainThreadTaskQueue::QueueType::kFrameLoading:
return "frame_loading_tq";
case MainThreadTaskQueue::QueueType::kFrameThrottleable:
......@@ -89,7 +87,6 @@ bool MainThreadTaskQueue::IsPerFrameTaskQueue(
case MainThreadTaskQueue::QueueType::kWebScheduling:
return true;
case MainThreadTaskQueue::QueueType::kControl:
case MainThreadTaskQueue::QueueType::kUnthrottled:
case MainThreadTaskQueue::QueueType::kCompositor:
case MainThreadTaskQueue::QueueType::kTest:
case MainThreadTaskQueue::QueueType::kV8:
......@@ -123,7 +120,6 @@ MainThreadTaskQueue::QueueClass MainThreadTaskQueue::QueueClassForQueueType(
case QueueType::kFrameLoading:
case QueueType::kFrameLoadingControl:
return QueueClass::kLoading;
case QueueType::kUnthrottled:
case QueueType::kFrameThrottleable:
case QueueType::kFrameDeferrable:
case QueueType::kFramePausable:
......
......@@ -49,7 +49,8 @@ class PLATFORM_EXPORT MainThreadTaskQueue
// 3 was used for default timer task runner but this was deprecated.
kUnthrottled = 4,
// 4: kUnthrottled, obsolete.
kFrameLoading = 5,
// 6 : kFrameThrottleable, replaced with FRAME_THROTTLEABLE.
// 7 : kFramePausable, replaced with kFramePausable
......
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