| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 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 | 8 |
| 9 #include "gm.h" | 9 #include "gm.h" |
| 10 #include "SkTArray.h" | 10 #include "SkTArray.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 protected: | 28 protected: |
| 29 virtual uint32_t onGetFlags() const SK_OVERRIDE { | 29 virtual uint32_t onGetFlags() const SK_OVERRIDE { |
| 30 return kSkipTiled_Flag; | 30 return kSkipTiled_Flag; |
| 31 } | 31 } |
| 32 | 32 |
| 33 virtual SkString onShortName() SK_OVERRIDE { | 33 virtual SkString onShortName() SK_OVERRIDE { |
| 34 return SkString("ovals"); | 34 return SkString("ovals"); |
| 35 } | 35 } |
| 36 | 36 |
| 37 virtual SkISize onISize() SK_OVERRIDE { | 37 virtual SkISize onISize() SK_OVERRIDE { |
| 38 return make_isize(1200, 900); | 38 return SkISize::Make(1200, 900); |
| 39 } | 39 } |
| 40 | 40 |
| 41 void makePaints() { | 41 void makePaints() { |
| 42 { | 42 { |
| 43 // no AA | 43 // no AA |
| 44 SkPaint p; | 44 SkPaint p; |
| 45 fPaints.push_back(p); | 45 fPaints.push_back(p); |
| 46 } | 46 } |
| 47 | 47 |
| 48 { | 48 { |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 | 282 |
| 283 typedef GM INHERITED; | 283 typedef GM INHERITED; |
| 284 }; | 284 }; |
| 285 | 285 |
| 286 ////////////////////////////////////////////////////////////////////////////// | 286 ////////////////////////////////////////////////////////////////////////////// |
| 287 | 287 |
| 288 static GM* MyFactory(void*) { return new OvalGM; } | 288 static GM* MyFactory(void*) { return new OvalGM; } |
| 289 static GMRegistry reg(MyFactory); | 289 static GMRegistry reg(MyFactory); |
| 290 | 290 |
| 291 } | 291 } |
| OLD | NEW |