| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 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 "SkCanvas.h" | 12 #include "SkCanvas.h" |
| 13 #include "SkPaint.h" | 13 #include "SkPaint.h" |
| 14 #include "SkSize.h" | 14 #include "SkSize.h" |
| 15 #include "SkString.h" | 15 #include "SkString.h" |
| 16 #include "SkTRegistry.h" | 16 #include "SkTRegistry.h" |
| 17 #include "sk_tool_utils.h" |
| 17 | 18 |
| 18 #if SK_SUPPORT_GPU | 19 #if SK_SUPPORT_GPU |
| 19 #include "GrContext.h" | 20 #include "GrContext.h" |
| 20 #endif | 21 #endif |
| 21 | 22 |
| 22 #define DEF_GM(code) \ | 23 #define DEF_GM(code) \ |
| 23 static skiagm::GM* SK_MACRO_APPEND_LINE(F_)(void*) { code; } \ | 24 static skiagm::GM* SK_MACRO_APPEND_LINE(F_)(void*) { code; } \ |
| 24 static skiagm::GMRegistry SK_MACRO_APPEND_LINE(R_)(SK_MACRO_APPEND_LINE(F_
)); | 25 static skiagm::GMRegistry SK_MACRO_APPEND_LINE(R_)(SK_MACRO_APPEND_LINE(F_
)); |
| 25 | 26 |
| 26 namespace skiagm { | 27 namespace skiagm { |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 SkColor fBGColor; | 116 SkColor fBGColor; |
| 116 bool fCanvasIsDeferred; // work-around problem in srcmode.cpp | 117 bool fCanvasIsDeferred; // work-around problem in srcmode.cpp |
| 117 bool fHaveCalledOnceBeforeDraw; | 118 bool fHaveCalledOnceBeforeDraw; |
| 118 SkMatrix fStarterMatrix; | 119 SkMatrix fStarterMatrix; |
| 119 }; | 120 }; |
| 120 | 121 |
| 121 typedef SkTRegistry<GM*(*)(void*)> GMRegistry; | 122 typedef SkTRegistry<GM*(*)(void*)> GMRegistry; |
| 122 } | 123 } |
| 123 | 124 |
| 124 #endif | 125 #endif |
| OLD | NEW |