| OLD | NEW |
| 1 #ifndef DMGpuTask_DEFINED | 1 #ifndef DMGpuTask_DEFINED |
| 2 #define DMGpuTask_DEFINED | 2 #define DMGpuTask_DEFINED |
| 3 | 3 |
| 4 #include "DMExpectations.h" | 4 #include "DMExpectations.h" |
| 5 #include "DMReporter.h" | 5 #include "DMReporter.h" |
| 6 #include "DMTask.h" | 6 #include "DMTask.h" |
| 7 #include "DMTaskRunner.h" | 7 #include "DMTaskRunner.h" |
| 8 #include "GrContextFactory.h" | 8 #include "GrContextFactory.h" |
| 9 #include "SkBitmap.h" | 9 #include "SkBitmap.h" |
| 10 #include "SkString.h" | 10 #include "SkString.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 SkColorType, | 25 SkColorType, |
| 26 GrContextFactory::GLContextType, | 26 GrContextFactory::GLContextType, |
| 27 int sampleCount); | 27 int sampleCount); |
| 28 | 28 |
| 29 virtual void draw() SK_OVERRIDE; | 29 virtual void draw() SK_OVERRIDE; |
| 30 virtual bool usesGpu() const SK_OVERRIDE { return true; } | 30 virtual bool usesGpu() const SK_OVERRIDE { return true; } |
| 31 virtual bool shouldSkip() const SK_OVERRIDE; | 31 virtual bool shouldSkip() const SK_OVERRIDE; |
| 32 virtual SkString name() const SK_OVERRIDE { return fName; } | 32 virtual SkString name() const SK_OVERRIDE { return fName; } |
| 33 | 33 |
| 34 private: | 34 private: |
| 35 TaskRunner* fTaskRunner; | |
| 36 SkAutoTDelete<skiagm::GM> fGM; | 35 SkAutoTDelete<skiagm::GM> fGM; |
| 37 const SkString fName; | 36 const SkString fName; |
| 38 const Expectations& fExpectations; | 37 const Expectations& fExpectations; |
| 39 const SkColorType fColorType; | 38 const SkColorType fColorType; |
| 40 const GrContextFactory::GLContextType fContextType; | 39 const GrContextFactory::GLContextType fContextType; |
| 41 const int fSampleCount; | 40 const int fSampleCount; |
| 42 }; | 41 }; |
| 43 | 42 |
| 44 } // namespace DM | 43 } // namespace DM |
| 45 | 44 |
| 46 #endif // DMGpuTask_DEFINED | 45 #endif // DMGpuTask_DEFINED |
| OLD | NEW |