| OLD | NEW |
| 1 #ifndef DMSKPTask_DEFINED | 1 #ifndef DMSKPTask_DEFINED |
| 2 #define DMSKPTask_DEFINED | 2 #define DMSKPTask_DEFINED |
| 3 | 3 |
| 4 #include "DMExpectations.h" |
| 4 #include "DMReporter.h" | 5 #include "DMReporter.h" |
| 5 #include "DMTask.h" | 6 #include "DMTask.h" |
| 6 #include "DMTaskRunner.h" | 7 #include "DMTaskRunner.h" |
| 7 #include "SkPicture.h" | 8 #include "SkPicture.h" |
| 8 #include "SkString.h" | 9 #include "SkString.h" |
| 9 #include "SkTemplates.h" | 10 #include "SkTemplates.h" |
| 10 | 11 |
| 11 // Draws an SKP to a raster canvas, then compares it with some other modes. | 12 // Draws an SKP to a raster canvas, then compares it with some other modes. |
| 12 | 13 |
| 13 namespace DM { | 14 namespace DM { |
| 14 | 15 |
| 15 class SKPTask : public CpuTask { | 16 class SKPTask : public CpuTask { |
| 16 public: | 17 public: |
| 17 SKPTask(Reporter*, TaskRunner*, const SkPicture*, SkString name); | 18 SKPTask(Reporter*, TaskRunner*, const Expectations&, const SkPicture*, SkStr
ing name); |
| 18 | 19 |
| 19 virtual void draw() SK_OVERRIDE; | 20 virtual void draw() SK_OVERRIDE; |
| 20 virtual bool shouldSkip() const SK_OVERRIDE { return false; } | 21 virtual bool shouldSkip() const SK_OVERRIDE { return false; } |
| 21 virtual SkString name() const SK_OVERRIDE { return fName; } | 22 virtual SkString name() const SK_OVERRIDE { return fName; } |
| 22 | 23 |
| 23 private: | 24 private: |
| 24 SkAutoTUnref<const SkPicture> fPicture; | 25 SkAutoTUnref<const SkPicture> fPicture; |
| 26 const Expectations& fExpectations; |
| 25 const SkString fName; | 27 const SkString fName; |
| 26 }; | 28 }; |
| 27 | 29 |
| 28 } // namespace DM | 30 } // namespace DM |
| 29 | 31 |
| 30 #endif // DMSKPTask_DEFINED | 32 #endif // DMSKPTask_DEFINED |
| OLD | NEW |