| OLD | NEW | 
|---|
| 1 #include "DMCpuGMTask.h" | 1 #include "DMCpuGMTask.h" | 
| 2 #include "DMExpectationsTask.h" | 2 #include "DMExpectationsTask.h" | 
| 3 #include "DMPipeTask.h" | 3 #include "DMPipeTask.h" | 
| 4 #include "DMQuiltTask.h" | 4 #include "DMQuiltTask.h" | 
| 5 #include "DMSerializeTask.h" | 5 #include "DMSerializeTask.h" | 
| 6 #include "DMUtil.h" | 6 #include "DMUtil.h" | 
| 7 #include "DMWriteTask.h" | 7 #include "DMWriteTask.h" | 
| 8 | 8 | 
| 9 namespace DM { | 9 namespace DM { | 
| 10 | 10 | 
| (...skipping 27 matching lines...) Expand all  Loading... | 
| 38     SPAWN(PipeTask, fGMFactory(NULL), bm, PipeTask::kCrossProcess_Mode); | 38     SPAWN(PipeTask, fGMFactory(NULL), bm, PipeTask::kCrossProcess_Mode); | 
| 39     SPAWN(PipeTask, fGMFactory(NULL), bm, PipeTask::kSharedAddress_Mode); | 39     SPAWN(PipeTask, fGMFactory(NULL), bm, PipeTask::kSharedAddress_Mode); | 
| 40 | 40 | 
| 41     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kNone_BBH,     QuiltTask::
    kDefault_Backend); | 41     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kNone_BBH,     QuiltTask::
    kDefault_Backend); | 
| 42     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kRTree_BBH,    QuiltTask::
    kDefault_Backend); | 42     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kRTree_BBH,    QuiltTask::
    kDefault_Backend); | 
| 43     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kTileGrid_BBH, QuiltTask::
    kDefault_Backend); | 43     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kTileGrid_BBH, QuiltTask::
    kDefault_Backend); | 
| 44     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kNone_BBH,     QuiltTask::
    kSkRecord_Backend); | 44     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kNone_BBH,     QuiltTask::
    kSkRecord_Backend); | 
| 45     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kRTree_BBH,    QuiltTask::
    kSkRecord_Backend); | 45     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kRTree_BBH,    QuiltTask::
    kSkRecord_Backend); | 
| 46     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kTileGrid_BBH, QuiltTask::
    kSkRecord_Backend); | 46     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kTileGrid_BBH, QuiltTask::
    kSkRecord_Backend); | 
| 47 | 47 | 
| 48     /* skia:2834 SkQuadTree does not return its data in the order it was inserte
    d. |  | 
| 49     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kQuadTree_BBH, QuiltTask::
    kDefault_Backend); |  | 
| 50     SPAWN(QuiltTask, fGMFactory(NULL), bm, QuiltTask::kQuadTree_BBH, QuiltTask::
    kSkRecord_Backend); |  | 
| 51     */ |  | 
| 52 |  | 
| 53     SPAWN(SerializeTask, fGMFactory(NULL), bm, SerializeTask::kNormal_Mode); | 48     SPAWN(SerializeTask, fGMFactory(NULL), bm, SerializeTask::kNormal_Mode); | 
| 54     SPAWN(SerializeTask, fGMFactory(NULL), bm, SerializeTask::kSkRecord_Mode); | 49     SPAWN(SerializeTask, fGMFactory(NULL), bm, SerializeTask::kSkRecord_Mode); | 
| 55 | 50 | 
| 56     SPAWN(WriteTask, bm); | 51     SPAWN(WriteTask, bm); | 
| 57 #undef SPAWN | 52 #undef SPAWN | 
| 58 } | 53 } | 
| 59 | 54 | 
| 60 bool CpuGMTask::shouldSkip() const { | 55 bool CpuGMTask::shouldSkip() const { | 
| 61     if (kRGB_565_SkColorType == fColorType && (fGM->getFlags() & skiagm::GM::kSk
    ip565_Flag)) { | 56     if (kRGB_565_SkColorType == fColorType && (fGM->getFlags() & skiagm::GM::kSk
    ip565_Flag)) { | 
| 62         return true; | 57         return true; | 
| 63     } | 58     } | 
| 64     if (fGM->getFlags() & skiagm::GM::kGPUOnly_Flag) { | 59     if (fGM->getFlags() & skiagm::GM::kGPUOnly_Flag) { | 
| 65         return true; | 60         return true; | 
| 66     } | 61     } | 
| 67     return false; | 62     return false; | 
| 68 } | 63 } | 
| 69 | 64 | 
| 70 }  // namespace DM | 65 }  // namespace DM | 
| OLD | NEW | 
|---|