| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 #ifndef skiagm_DEFINED | 8 #ifndef skiagm_DEFINED |
| 9 #define skiagm_DEFINED | 9 #define skiagm_DEFINED |
| 10 | 10 |
| 11 #include "SkBitmap.h" | 11 #include "SkBitmap.h" |
| 12 #include "SkBitmapDevice.h" |
| 12 #include "SkCanvas.h" | 13 #include "SkCanvas.h" |
| 13 #include "SkDevice.h" | |
| 14 #include "SkPaint.h" | 14 #include "SkPaint.h" |
| 15 #include "SkSize.h" | 15 #include "SkSize.h" |
| 16 #include "SkString.h" | 16 #include "SkString.h" |
| 17 #include "SkTRegistry.h" | 17 #include "SkTRegistry.h" |
| 18 | 18 |
| 19 #define DEF_GM(code) \ | 19 #define DEF_GM(code) \ |
| 20 static skiagm::GM* SK_MACRO_APPEND_LINE(F_)(void*) { code; } \ | 20 static skiagm::GM* SK_MACRO_APPEND_LINE(F_)(void*) { code; } \ |
| 21 static skiagm::GMRegistry SK_MACRO_APPEND_LINE(R_)(SK_MACRO_APPEND_LINE(F_
)); | 21 static skiagm::GMRegistry SK_MACRO_APPEND_LINE(R_)(SK_MACRO_APPEND_LINE(F_
)); |
| 22 | 22 |
| 23 namespace skiagm { | 23 namespace skiagm { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 SkString fShortName; | 108 SkString fShortName; |
| 109 SkColor fBGColor; | 109 SkColor fBGColor; |
| 110 bool fCanvasIsDeferred; // work-around problem in srcmode.cpp | 110 bool fCanvasIsDeferred; // work-around problem in srcmode.cpp |
| 111 bool fHaveCalledOnceBeforeDraw; | 111 bool fHaveCalledOnceBeforeDraw; |
| 112 }; | 112 }; |
| 113 | 113 |
| 114 typedef SkTRegistry<GM*, void*> GMRegistry; | 114 typedef SkTRegistry<GM*, void*> GMRegistry; |
| 115 } | 115 } |
| 116 | 116 |
| 117 #endif | 117 #endif |
| OLD | NEW |