| OLD | NEW | 
|---|
| 1 #ifndef DMUtil_DEFINED | 1 #ifndef DMUtil_DEFINED | 
| 2 #define DMUtil_DEFINED | 2 #define DMUtil_DEFINED | 
| 3 | 3 | 
|  | 4 #include "SkBenchmark.h" | 
| 4 #include "SkBitmap.h" | 5 #include "SkBitmap.h" | 
| 5 #include "SkString.h" | 6 #include "SkString.h" | 
| 6 #include "gm_expectations.h" | 7 #include "gm_expectations.h" | 
| 7 | 8 | 
| 8 // Small free functions used in more than one place in DM. | 9 // Small free functions used in more than one place in DM. | 
| 9 | 10 | 
| 10 namespace DM { | 11 namespace DM { | 
| 11 | 12 | 
| 12 // UnderJoin("a", "b") -> "a_b" | 13 // UnderJoin("a", "b") -> "a_b" | 
| 13 SkString UnderJoin(const char* a, const char* b); | 14 SkString UnderJoin(const char* a, const char* b); | 
| 14 | 15 | 
| 15 // Draw gm to picture.  Passes recordFlags to SkPicture::beginRecording(). | 16 // Draw gm to picture.  Passes recordFlags to SkPicture::beginRecording(). | 
| 16 void RecordPicture(skiagm::GM* gm, SkPicture* picture, uint32_t recordFlags = 0)
    ; | 17 void RecordPicture(skiagm::GM* gm, SkPicture* picture, uint32_t recordFlags = 0)
    ; | 
| 17 | 18 | 
| 18 // Prepare bitmap to have gm draw into it with this config. | 19 // Prepare bitmap to have gm or bench draw into it with this config. | 
|  | 20 // TODO(mtklein): make SkBenchmark::getSize()/GM::getISize() const. | 
| 19 void SetupBitmap(const SkColorType, skiagm::GM* gm, SkBitmap* bitmap); | 21 void SetupBitmap(const SkColorType, skiagm::GM* gm, SkBitmap* bitmap); | 
|  | 22 void SetupBitmap(const SkColorType, SkBenchmark* bench, SkBitmap* bitmap); | 
| 20 | 23 | 
| 21 // Draw picture to bitmap. | 24 // Draw picture to bitmap. | 
| 22 void DrawPicture(SkPicture* picture, SkBitmap* bitmap); | 25 void DrawPicture(SkPicture* picture, SkBitmap* bitmap); | 
| 23 | 26 | 
| 24 // Are these identical bitmaps? | 27 // Are these identical bitmaps? | 
| 25 bool BitmapsEqual(const SkBitmap& a, const SkBitmap& b); | 28 bool BitmapsEqual(const SkBitmap& a, const SkBitmap& b); | 
| 26 | 29 | 
| 27 }  // namespace DM | 30 }  // namespace DM | 
| 28 | 31 | 
| 29 #endif  // DMUtil_DEFINED | 32 #endif  // DMUtil_DEFINED | 
| OLD | NEW | 
|---|