Index: Source/platform/scheduler/Scheduler.h |
diff --git a/Source/platform/scheduler/Scheduler.h b/Source/platform/scheduler/Scheduler.h |
index c492e580aa17268afe30b6c439a9c08acd08638f..148f0dadd106ddda218ccc38ccf9f1f661681a32 100644 |
--- a/Source/platform/scheduler/Scheduler.h |
+++ b/Source/platform/scheduler/Scheduler.h |
@@ -6,8 +6,11 @@ |
#define Scheduler_h |
#include "platform/PlatformExport.h" |
+#include "platform/TraceLocation.h" |
+#include "platform/scheduler/DoubleBufferedDeque.h" |
#include "wtf/Functional.h" |
#include "wtf/Noncopyable.h" |
+#include "wtf/ThreadingPrimitives.h" |
namespace blink { |
class WebThread; |
@@ -40,7 +43,7 @@ public: |
// Returns true if there is high priority work pending on the main thread |
// and the caller should yield to let the scheduler service that work. |
- // Can be called on the main thread. |
+ // Can be called on any thread. |
bool shouldYieldForHighPriorityWork(); |
// The shared timer can be used to schedule a periodic callback which may |
@@ -50,19 +53,43 @@ public: |
void stopSharedTimer(); |
private: |
+ class MainThreadPendingTaskRunner; |
eseidel
2014/08/08 17:31:07
Do you need these forward declarations in order to
alexclarke
2014/08/12 11:37:02
gcc requires this sadly.
|
+ class MainThreadPendingHighPriorityTaskRunner; |
+ friend class MainThreadPendingTaskRunner; |
+ friend class MainThreadPendingHighPriorityTaskRunner; |
+ |
Scheduler(); |
~Scheduler(); |
- void scheduleTask(const TraceLocation&, const Task&); |
void scheduleIdleTask(const IdleTask&); |
static void sharedTimerAdapter(); |
void tickSharedTimer(); |
static Scheduler* s_sharedScheduler; |
- blink::WebThread* m_mainThread; |
+ class TracedTask { |
eseidel
2014/08/08 17:31:07
How is this different from Task? Can all Tasks's
alexclarke
2014/08/12 11:37:02
Done.
|
+ public: |
+ TracedTask(const Task& task, const TraceLocation& location) |
+ : m_task(task) |
+ , m_location(location) { } |
+ |
+ void run(); |
+ |
+ private: |
+ Task m_task; |
+ TraceLocation m_location; |
+ }; |
+ |
+ void maybePostMainThreadPendingHighPriorityTaskRunner(); |
+ void runHighPriorityTasks(); |
+ |
+ // These members can be accessed from any thread. |
+ blink::WebThread* m_mainThread; |
eseidel
2014/08/08 17:31:07
You shouldn't need blink:: here.
alexclarke
2014/08/12 11:37:02
Done.
|
+ DoubleBufferedDeque<TracedTask> m_pendingInputTasks; |
+ DoubleBufferedDeque<TracedTask> m_pendingCompositorTasks; |
void (*m_sharedTimerFunction)(); |
+ volatile int m_mainThreadTaskRunnerCount; |
}; |
} // namespace blink |