[content] Add support for Non nestable idle tasks the the RendererScheduler

content/renderer/scheduler/task_queue_manager.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_
 #define CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_
 
 #include "base/atomic_sequence_num.h"
 #include "base/debug/task_annotator.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/pending_task.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/content_export.h"
+#include "content/renderer/scheduler/nestable_single_thread_task_runner.h"

[Sami, 2015/03/12 18:53:11]

Forward decl here too?

[rmcilroy, 2015/03/13 10:56:53]

Done.

 
 namespace base {
 namespace trace_event {
 class ConvertableToTraceFormat;
 class TracedValue;
 }
 }
 
 namespace cc {
 class TestNowSource;
@@ skipping 33 matching lines @@
     // automatically scheduled for execution or transferred to the work queue.
     // Instead, the selector should call PumpQueue() when necessary to bring
     // in new tasks for execution.
     MANUAL
   };
 
   // Create a task queue manager with |task_queue_count| task queues.
   // |main_task_runner| identifies the thread on which where the tasks are
   // eventually run. |selector| is used to choose which task queue to service.
   // It should outlive this class.
-  TaskQueueManager(size_t task_queue_count,
-                   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-                   TaskQueueSelector* selector);
+  TaskQueueManager(
+      size_t task_queue_count,
+      scoped_refptr<NestableSingleThreadTaskRunner> main_task_runner,
+      TaskQueueSelector* selector);
   ~TaskQueueManager();
 
   // Returns the task runner which targets the queue selected by |queue_index|.
   scoped_refptr<base::SingleThreadTaskRunner> TaskRunnerForQueue(
       size_t queue_index) const;
 
   // Sets the pump policy for the |queue_index| to |pump_policy|. By
   // default queues are created with AUTO_PUMP_POLICY.
   void SetPumpPolicy(size_t queue_index, PumpPolicy pump_policy);
 
@@ skipping 78 matching lines @@
   base::TimeTicks Now() const;
 
   scoped_refptr<base::trace_event::ConvertableToTraceFormat>
   AsValueWithSelectorResult(bool should_run, size_t selected_queue) const;
 
   std::vector<scoped_refptr<internal::TaskQueue>> queues_;
   base::AtomicSequenceNumber task_sequence_num_;
   base::debug::TaskAnnotator task_annotator_;
 
   base::ThreadChecker main_thread_checker_;
-  scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
+  scoped_refptr<NestableSingleThreadTaskRunner> main_task_runner_;
   TaskQueueSelector* selector_;
 
   base::WeakPtr<TaskQueueManager> task_queue_manager_weak_ptr_;
 
   // The pending_dowork_count_ is only tracked on the main thread since that's
   // where re-entrant problems happen.
   int pending_dowork_count_;
 
   int work_batch_size_;
 
   scoped_refptr<cc::TestNowSource> time_source_;
 
   ObserverList<base::MessageLoop::TaskObserver> task_observers_;
 
   base::WeakPtrFactory<TaskQueueManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskQueueManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SCHEDULER_TASK_QUEUE_MANAGER_H_