| OLD | NEW |
| 1 #ifndef DMTask_DEFINED | 1 #ifndef DMTask_DEFINED |
| 2 #define DMTask_DEFINED | 2 #define DMTask_DEFINED |
| 3 | 3 |
| 4 #include "DMReporter.h" | 4 #include "DMReporter.h" |
| 5 #include "DMGpuSupport.h" | 5 #include "DMGpuSupport.h" |
| 6 #include "SkRunnable.h" | 6 #include "Runnable.h" |
| 7 #include "SkTime.h" | 7 #include "SkTime.h" |
| 8 | 8 |
| 9 // DM will run() these tasks on one of two threadpools. | 9 // DM will run() these tasks on one of two threadpools. |
| 10 // Subclasses can call fail() to mark this task as failed, or make any number of
spawnChild() calls | 10 // Subclasses can call fail() to mark this task as failed, or make any number of
spawnChild() calls |
| 11 // to kick off dependent tasks. | 11 // to kick off dependent tasks. |
| 12 // | 12 // |
| 13 // Tasks delete themselves when run. | 13 // Tasks delete themselves when run. |
| 14 | 14 |
| 15 namespace DM { | 15 namespace DM { |
| 16 | 16 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 void spawnChildNext(CpuTask* task); // For now we don't allow GPU child tas
ks. | 39 void spawnChildNext(CpuTask* task); // For now we don't allow GPU child tas
ks. |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 Reporter* fReporter; // Unowned. | 42 Reporter* fReporter; // Unowned. |
| 43 TaskRunner* fTaskRunner; // Unowned. | 43 TaskRunner* fTaskRunner; // Unowned. |
| 44 int fDepth; | 44 int fDepth; |
| 45 SkMSec fStart; | 45 SkMSec fStart; |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 class CpuTask : public Task, public SkRunnable { | 48 class CpuTask : public Task, public Runnable { |
| 49 public: | 49 public: |
| 50 CpuTask(Reporter* reporter, TaskRunner* taskRunner); | 50 CpuTask(Reporter* reporter, TaskRunner* taskRunner); |
| 51 CpuTask(const Task& parent); | 51 CpuTask(const Task& parent); |
| 52 virtual ~CpuTask() {} | 52 virtual ~CpuTask() {} |
| 53 | 53 |
| 54 void run() SK_OVERRIDE; | 54 void run() SK_OVERRIDE; |
| 55 virtual void draw() = 0; | 55 virtual void draw() = 0; |
| 56 | 56 |
| 57 void spawnChild(CpuTask* task); | 57 void spawnChild(CpuTask* task); |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 class GpuTask : public Task, public SkTRunnable<GrContextFactory> { | 60 class GpuTask : public Task, public TRunnable<GrContextFactory> { |
| 61 public: | 61 public: |
| 62 GpuTask(Reporter* reporter, TaskRunner* taskRunner); | 62 GpuTask(Reporter* reporter, TaskRunner* taskRunner); |
| 63 virtual ~GpuTask() {} | 63 virtual ~GpuTask() {} |
| 64 | 64 |
| 65 void run(GrContextFactory&) SK_OVERRIDE; | 65 void run(GrContextFactory&) SK_OVERRIDE; |
| 66 virtual void draw(GrContextFactory*) = 0; | 66 virtual void draw(GrContextFactory*) = 0; |
| 67 | 67 |
| 68 void spawnChild(CpuTask* task); | 68 void spawnChild(CpuTask* task); |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 } // namespace DM | 71 } // namespace DM |
| 72 | 72 |
| 73 #endif // DMTask_DEFINED | 73 #endif // DMTask_DEFINED |
| OLD | NEW |