| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 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 #include "gm.h" | 8 #include "gm.h" |
| 9 | 9 |
| 10 #include "Resources.h" | 10 #include "Resources.h" |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 | 212 |
| 213 private: | 213 private: |
| 214 typedef GM INHERITED; | 214 typedef GM INHERITED; |
| 215 }; | 215 }; |
| 216 #endif // SK_IGNORE_ETC1_SUPPORT | 216 #endif // SK_IGNORE_ETC1_SUPPORT |
| 217 | 217 |
| 218 } // namespace skiagm | 218 } // namespace skiagm |
| 219 | 219 |
| 220 ////////////////////////////////////////////////////////////////////////////// | 220 ////////////////////////////////////////////////////////////////////////////// |
| 221 | 221 |
| 222 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_PKM_GM); ) | 222 DEF_GM(return new skiagm::ETC1Bitmap_PKM_GM;) |
| 223 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_KTX_GM); ) | 223 DEF_GM(return new skiagm::ETC1Bitmap_KTX_GM;) |
| 224 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_R11_KTX_GM); ) | 224 DEF_GM(return new skiagm::ETC1Bitmap_R11_KTX_GM;) |
| 225 | 225 |
| 226 #ifndef SK_IGNORE_ETC1_SUPPORT | 226 #ifndef SK_IGNORE_ETC1_SUPPORT |
| 227 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_NPOT_GM); ) | 227 DEF_GM(return new skiagm::ETC1Bitmap_NPOT_GM;) |
| 228 #endif // SK_IGNORE_ETC1_SUPPORT | 228 #endif // SK_IGNORE_ETC1_SUPPORT |
| OLD | NEW |