Avoid using default argument for WebTaskRunnerImpl::Create

This CL is just refactoring to avoid default arguments. We plan to replace base::nullopt with specific task types. Bug: 780785 Change-Id: I1369ac944fa49f6aed11a841d17011d1c3a1faf9 Reviewed-on: https://chromium-review.googlesource.com/781330 Reviewed-by: Kentaro Hara <haraken@chromium.org> Reviewed-by: Alexander Timin <altimin@chromium.org> Commit-Queue: Hajime Hoshi <hajimehoshi@chromium.org> Cr-Commit-Position: refs/heads/master@{#518625}
mirror · Nov 22, 2017 · acd2caf · acd2caf
1 parent 74552f9
commit acd2caf
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git a/third_party/WebKit/Source/platform/TimerTest.cpp b/third_party/WebKit/Source/platform/TimerTest.cpp
@@ -541,7 +541,7 @@ TEST_F(TimerTest, UserSuppliedWebTaskRunner) {
       platform_->GetRendererScheduler()->NewTimerTaskQueue(
           scheduler::MainThreadTaskQueue::QueueType::kFrameThrottleable));
   scoped_refptr<scheduler::WebTaskRunnerImpl> web_task_runner =
-      scheduler::WebTaskRunnerImpl::Create(task_runner);
+      scheduler::WebTaskRunnerImpl::Create(task_runner, base::nullopt);
   TimerForTest<TimerTest> timer(web_task_runner, this,
                                 &TimerTest::CountingTask);
   timer.StartOneShot(0, BLINK_FROM_HERE);
@@ -632,15 +632,15 @@ TEST_F(TimerTest, MoveToNewTaskRunnerOneShot) {
       platform_->GetRendererScheduler()->NewTimerTaskQueue(
           scheduler::MainThreadTaskQueue::QueueType::kFrameThrottleable));
   scoped_refptr<scheduler::WebTaskRunnerImpl> web_task_runner1 =
-      scheduler::WebTaskRunnerImpl::Create(task_runner1);
+      scheduler::WebTaskRunnerImpl::Create(task_runner1, base::nullopt);
   TaskObserver task_observer1(web_task_runner1, &run_order);
   task_runner1->AddTaskObserver(&task_observer1);
 
   scoped_refptr<scheduler::TaskQueue> task_runner2(
       platform_->GetRendererScheduler()->NewTimerTaskQueue(
           scheduler::MainThreadTaskQueue::QueueType::kFrameThrottleable));
   scoped_refptr<scheduler::WebTaskRunnerImpl> web_task_runner2 =
-      scheduler::WebTaskRunnerImpl::Create(task_runner2);
+      scheduler::WebTaskRunnerImpl::Create(task_runner2, base::nullopt);
   TaskObserver task_observer2(web_task_runner2, &run_order);
   task_runner2->AddTaskObserver(&task_observer2);
 
@@ -672,15 +672,15 @@ TEST_F(TimerTest, MoveToNewTaskRunnerRepeating) {
       platform_->GetRendererScheduler()->NewTimerTaskQueue(
           scheduler::MainThreadTaskQueue::QueueType::kFrameThrottleable));
   scoped_refptr<scheduler::WebTaskRunnerImpl> web_task_runner1 =
-      scheduler::WebTaskRunnerImpl::Create(task_runner1);
+      scheduler::WebTaskRunnerImpl::Create(task_runner1, base::nullopt);
   TaskObserver task_observer1(web_task_runner1, &run_order);
   task_runner1->AddTaskObserver(&task_observer1);
 
   scoped_refptr<scheduler::TaskQueue> task_runner2(
       platform_->GetRendererScheduler()->NewTimerTaskQueue(
           scheduler::MainThreadTaskQueue::QueueType::kFrameThrottleable));
   scoped_refptr<scheduler::WebTaskRunnerImpl> web_task_runner2 =
-      scheduler::WebTaskRunnerImpl::Create(task_runner2);
+      scheduler::WebTaskRunnerImpl::Create(task_runner2, base::nullopt);
   TaskObserver task_observer2(web_task_runner2, &run_order);
   task_runner2->AddTaskObserver(&task_observer2);
 
@@ -714,13 +714,13 @@ TEST_F(TimerTest, MoveToNewTaskRunnerWithoutTasks) {
       platform_->GetRendererScheduler()->NewTimerTaskQueue(
           scheduler::MainThreadTaskQueue::QueueType::kFrameThrottleable));
   scoped_refptr<scheduler::WebTaskRunnerImpl> web_task_runner1 =
-      scheduler::WebTaskRunnerImpl::Create(task_runner1);
+      scheduler::WebTaskRunnerImpl::Create(task_runner1, base::nullopt);
 
   scoped_refptr<scheduler::TaskQueue> task_runner2(
       platform_->GetRendererScheduler()->NewTimerTaskQueue(
           scheduler::MainThreadTaskQueue::QueueType::kFrameThrottleable));
   scoped_refptr<scheduler::WebTaskRunnerImpl> web_task_runner2 =
-      scheduler::WebTaskRunnerImpl::Create(task_runner2);
+      scheduler::WebTaskRunnerImpl::Create(task_runner2, base::nullopt);
 
   TimerForTest<TimerTest> timer(web_task_runner1, this,
                                 &TimerTest::CountingTask);

diff --git a/third_party/WebKit/Source/platform/scheduler/child/web_scheduler_impl.cc b/third_party/WebKit/Source/platform/scheduler/child/web_scheduler_impl.cc
@@ -23,9 +23,12 @@ WebSchedulerImpl::WebSchedulerImpl(
     scoped_refptr<TaskQueue> v8_task_runner)
     : child_scheduler_(child_scheduler),
       idle_task_runner_(idle_task_runner),
-      loading_web_task_runner_(WebTaskRunnerImpl::Create(loading_task_runner)),
-      timer_web_task_runner_(WebTaskRunnerImpl::Create(timer_task_runner)),
-      v8_web_task_runner_(WebTaskRunnerImpl::Create(v8_task_runner)) {}
+      loading_web_task_runner_(
+          WebTaskRunnerImpl::Create(loading_task_runner, base::nullopt)),
+      timer_web_task_runner_(
+          WebTaskRunnerImpl::Create(timer_task_runner, base::nullopt)),
+      v8_web_task_runner_(
+          WebTaskRunnerImpl::Create(v8_task_runner, base::nullopt)) {}
 
 WebSchedulerImpl::~WebSchedulerImpl() {}
 

diff --git a/third_party/WebKit/Source/platform/scheduler/child/web_task_runner_impl.h b/third_party/WebKit/Source/platform/scheduler/child/web_task_runner_impl.h
@@ -24,7 +24,7 @@ class PLATFORM_EXPORT WebTaskRunnerImpl : public WebTaskRunner {
  public:
   static scoped_refptr<WebTaskRunnerImpl> Create(
       scoped_refptr<TaskQueue> task_queue,
-      base::Optional<TaskType> task_type = base::nullopt);
+      base::Optional<TaskType> task_type);
 
   // WebTaskRunner implementation:
   bool RunsTasksInCurrentSequence() override;

diff --git a/third_party/WebKit/Source/platform/scheduler/child/webthread_impl_for_worker_scheduler.cc b/third_party/WebKit/Source/platform/scheduler/child/webthread_impl_for_worker_scheduler.cc
@@ -74,7 +74,7 @@ void WebThreadImplForWorkerScheduler::InitOnThread(
       worker_scheduler_->DefaultTaskQueue(),
       worker_scheduler_->DefaultTaskQueue()));
   base::MessageLoop::current()->AddDestructionObserver(this);
-  web_task_runner_ = WebTaskRunnerImpl::Create(task_queue_);
+  web_task_runner_ = WebTaskRunnerImpl::Create(task_queue_, base::nullopt);
   completion->Signal();
 }
 

diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_web_scheduler_impl.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_web_scheduler_impl.cc
@@ -23,8 +23,9 @@ RendererWebSchedulerImpl::RendererWebSchedulerImpl(
                        renderer_scheduler->TimerTaskQueue(),
                        renderer_scheduler->kV8TaskQueue()),
       renderer_scheduler_(renderer_scheduler),
-      compositor_task_runner_(WebTaskRunnerImpl::Create(
-          renderer_scheduler_->CompositorTaskQueue())) {}
+      compositor_task_runner_(
+          WebTaskRunnerImpl::Create(renderer_scheduler_->CompositorTaskQueue(),
+                                    base::nullopt)) {}
 
 RendererWebSchedulerImpl::~RendererWebSchedulerImpl() {}
 

diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/web_view_scheduler_impl_unittest.cc
@@ -67,11 +67,11 @@ class WebViewSchedulerImplTest : public ::testing::Test {
   }
 
   scoped_refptr<WebTaskRunner> ThrottleableTaskRunner() {
-    return WebTaskRunnerImpl::Create(ThrottleableTaskQueue());
+    return WebTaskRunnerImpl::Create(ThrottleableTaskQueue(), base::nullopt);
   }
 
   scoped_refptr<WebTaskRunner> LoadingTaskRunner() {
-    return WebTaskRunnerImpl::Create(LoadingTaskQueue());
+    return WebTaskRunnerImpl::Create(LoadingTaskQueue(), base::nullopt);
   }
 
   scoped_refptr<TaskQueue> ThrottleableTaskQueue() {

diff --git a/..._party/WebKit/Source/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler.cc b/..._party/WebKit/Source/platform/scheduler/renderer/webthread_impl_for_renderer_scheduler.cc
@@ -20,8 +20,8 @@ WebThreadImplForRendererScheduler::WebThreadImplForRendererScheduler(
       idle_task_runner_(scheduler->IdleTaskRunner()),
       scheduler_(scheduler),
       thread_id_(base::PlatformThread::CurrentId()),
-      web_task_runner_(
-          WebTaskRunnerImpl::Create(scheduler->DefaultTaskQueue())) {}
+      web_task_runner_(WebTaskRunnerImpl::Create(scheduler->DefaultTaskQueue(),
+                                                 base::nullopt)) {}
 
 WebThreadImplForRendererScheduler::~WebThreadImplForRendererScheduler() {}