| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 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 #ifndef fiddle_main_DEFINED | 7 #ifndef fiddle_main_DEFINED |
| 8 #define fiddle_main_DEFINED | 8 #define fiddle_main_DEFINED |
| 9 | 9 |
| 10 #include "skia.h" | 10 #include "skia.h" |
| 11 | 11 |
| 12 extern SkBitmap source; | 12 extern SkBitmap source; |
| 13 extern SkImage* image; | 13 extern sk_sp<SkImage> image; |
| 14 | 14 |
| 15 struct DrawOptions { | 15 struct DrawOptions { |
| 16 DrawOptions(int w, int h, bool r, bool g, bool p, bool k, const char* s) | 16 DrawOptions(int w, int h, bool r, bool g, bool p, bool k, const char* s) |
| 17 : size(SkISize::Make(w, h)) | 17 : size(SkISize::Make(w, h)) |
| 18 , raster(r) | 18 , raster(r) |
| 19 , gpu(g) | 19 , gpu(g) |
| 20 , pdf(p) | 20 , pdf(p) |
| 21 , skp(k) | 21 , skp(k) |
| 22 , source(s) {} | 22 , source(s) {} |
| 23 SkISize size; | 23 SkISize size; |
| 24 bool raster; | 24 bool raster; |
| 25 bool gpu; | 25 bool gpu; |
| 26 bool pdf; | 26 bool pdf; |
| 27 bool skp; | 27 bool skp; |
| 28 const char* source; | 28 const char* source; |
| 29 }; | 29 }; |
| 30 | 30 |
| 31 extern DrawOptions GetDrawOptions(); | 31 extern DrawOptions GetDrawOptions(); |
| 32 extern void draw(SkCanvas*); | 32 extern void draw(SkCanvas*); |
| 33 | 33 |
| 34 #endif // fiddle_main_DEFINED | 34 #endif // fiddle_main_DEFINED |
| OLD | NEW |