| OLD | NEW |
| 1 #include "DMUtil.h" | 1 #include "DMUtil.h" |
| 2 | 2 |
| 3 #include "SkPicture.h" | 3 #include "SkPicture.h" |
| 4 | 4 |
| 5 namespace DM { | 5 namespace DM { |
| 6 | 6 |
| 7 SkString UnderJoin(const char* a, const char* b) { | 7 SkString UnderJoin(const char* a, const char* b) { |
| 8 SkString s; | 8 SkString s; |
| 9 s.appendf("%s_%s", a, b); | 9 s.appendf("%s_%s", a, b); |
| 10 return s; | 10 return s; |
| 11 } | 11 } |
| 12 | 12 |
| 13 void RecordPicture(skiagm::GM* gm, SkPicture* picture, uint32_t recordFlags) { | 13 void RecordPicture(skiagm::GM* gm, SkPicture* picture, uint32_t recordFlags) { |
| 14 const SkISize size = gm->getISize(); | 14 const SkISize size = gm->getISize(); |
| 15 SkCanvas* canvas = picture->beginRecording(size.width(), size.height(), reco
rdFlags); | 15 SkCanvas* canvas = picture->beginRecording(size.width(), size.height(), reco
rdFlags); |
| 16 canvas->concat(gm->getInitialTransform()); | 16 canvas->concat(gm->getInitialTransform()); |
| 17 gm->draw(canvas); | 17 gm->draw(canvas); |
| 18 canvas->flush(); | 18 canvas->flush(); |
| 19 picture->endRecording(); | 19 picture->endRecording(); |
| 20 } | 20 } |
| 21 | 21 |
| 22 void SetupBitmap(const SkBitmap::Config config, skiagm::GM* gm, SkBitmap* bitmap
) { | 22 void SetupBitmap(const SkColorType ct, skiagm::GM* gm, SkBitmap* bitmap) { |
| 23 const SkISize size = gm->getISize(); | 23 const SkISize size = gm->getISize(); |
| 24 bitmap->setConfig(config, size.width(), size.height()); | 24 bitmap->allocPixels(SkImageInfo::Make(size.width(), size.height(), |
| 25 bitmap->allocPixels(); | 25 ct, kPremul_SkAlphaType)); |
| 26 bitmap->eraseColor(0x00000000); | 26 bitmap->eraseColor(0x00000000); |
| 27 } | 27 } |
| 28 | 28 |
| 29 void DrawPicture(SkPicture* picture, SkBitmap* bitmap) { | 29 void DrawPicture(SkPicture* picture, SkBitmap* bitmap) { |
| 30 SkASSERT(picture != NULL); | 30 SkASSERT(picture != NULL); |
| 31 SkASSERT(bitmap != NULL); | 31 SkASSERT(bitmap != NULL); |
| 32 SkCanvas canvas(*bitmap); | 32 SkCanvas canvas(*bitmap); |
| 33 canvas.drawPicture(*picture); | 33 canvas.drawPicture(*picture); |
| 34 canvas.flush(); | 34 canvas.flush(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 bool BitmapsEqual(const SkBitmap& a, const SkBitmap& b) { | 37 bool BitmapsEqual(const SkBitmap& a, const SkBitmap& b) { |
| 38 const SkAutoLockPixels lockA(a), lockB(b); | 38 const SkAutoLockPixels lockA(a), lockB(b); |
| 39 return a.getSize() == b.getSize() && 0 == memcmp(a.getPixels(), b.getPixels(
), b.getSize()); | 39 return a.getSize() == b.getSize() && 0 == memcmp(a.getPixels(), b.getPixels(
), b.getSize()); |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace DM | 42 } // namespace DM |
| OLD | NEW |