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 "SkBitmapDevice.h" |
bsalomon
2014/02/12 15:56:37
just remove it?
reed1
2014/02/12 17:24:10
Done.
| |
13 #include "SkCanvas.h" | 13 #include "SkCanvas.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 #if SK_SUPPORT_GPU | 19 #if SK_SUPPORT_GPU |
20 #include "GrContext.h" | 20 #include "GrContext.h" |
21 #endif | 21 #endif |
22 | 22 |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
132 SkColor fBGColor; | 132 SkColor fBGColor; |
133 bool fCanvasIsDeferred; // work-around problem in srcmode.cpp | 133 bool fCanvasIsDeferred; // work-around problem in srcmode.cpp |
134 bool fHaveCalledOnceBeforeDraw; | 134 bool fHaveCalledOnceBeforeDraw; |
135 SkMatrix fStarterMatrix; | 135 SkMatrix fStarterMatrix; |
136 }; | 136 }; |
137 | 137 |
138 typedef SkTRegistry<GM*(*)(void*)> GMRegistry; | 138 typedef SkTRegistry<GM*(*)(void*)> GMRegistry; |
139 } | 139 } |
140 | 140 |
141 #endif | 141 #endif |
OLD | NEW |