| 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 #include "SkBenchmark.h" | 8 #include "SkBenchmark.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkPaint.h" | 10 #include "SkPaint.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 OvalBench(void* param, int shift) : RectBench(param, shift) {} | 112 OvalBench(void* param, int shift) : RectBench(param, shift) {} |
| 113 protected: | 113 protected: |
| 114 virtual void drawThisRect(SkCanvas* c, const SkRect& r, const SkPaint& p) { | 114 virtual void drawThisRect(SkCanvas* c, const SkRect& r, const SkPaint& p) { |
| 115 c->drawOval(r, p); | 115 c->drawOval(r, p); |
| 116 } | 116 } |
| 117 virtual const char* onGetName() { return computeName("ovals"); } | 117 virtual const char* onGetName() { return computeName("ovals"); } |
| 118 }; | 118 }; |
| 119 | 119 |
| 120 class RRectBench : public RectBench { | 120 class RRectBench : public RectBench { |
| 121 public: | 121 public: |
| 122 RRectBench(void* param, int shift) : RectBench(param, shift) {} | 122 RRectBench(void* param, int shift, int stroke = 0) : RectBench(param, shift,
stroke) {} |
| 123 protected: | 123 protected: |
| 124 virtual void drawThisRect(SkCanvas* c, const SkRect& r, const SkPaint& p) { | 124 virtual void drawThisRect(SkCanvas* c, const SkRect& r, const SkPaint& p) { |
| 125 c->drawRoundRect(r, r.width() / 4, r.height() / 4, p); | 125 c->drawRoundRect(r, r.width() / 4, r.height() / 4, p); |
| 126 } | 126 } |
| 127 virtual const char* onGetName() { return computeName("rrects"); } | 127 virtual const char* onGetName() { return computeName("rrects"); } |
| 128 }; | 128 }; |
| 129 | 129 |
| 130 class PointsBench : public RectBench { | 130 class PointsBench : public RectBench { |
| 131 public: | 131 public: |
| 132 SkCanvas::PointMode fMode; | 132 SkCanvas::PointMode fMode; |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 }; | 275 }; |
| 276 | 276 |
| 277 | 277 |
| 278 DEF_BENCH( return SkNEW_ARGS(RectBench, (p, 1)); ) | 278 DEF_BENCH( return SkNEW_ARGS(RectBench, (p, 1)); ) |
| 279 DEF_BENCH( return SkNEW_ARGS(RectBench, (p, 1, 4)); ) | 279 DEF_BENCH( return SkNEW_ARGS(RectBench, (p, 1, 4)); ) |
| 280 DEF_BENCH( return SkNEW_ARGS(RectBench, (p, 3)); ) | 280 DEF_BENCH( return SkNEW_ARGS(RectBench, (p, 3)); ) |
| 281 DEF_BENCH( return SkNEW_ARGS(RectBench, (p, 3, 4)); ) | 281 DEF_BENCH( return SkNEW_ARGS(RectBench, (p, 3, 4)); ) |
| 282 DEF_BENCH( return SkNEW_ARGS(OvalBench, (p, 1)); ) | 282 DEF_BENCH( return SkNEW_ARGS(OvalBench, (p, 1)); ) |
| 283 DEF_BENCH( return SkNEW_ARGS(OvalBench, (p, 3)); ) | 283 DEF_BENCH( return SkNEW_ARGS(OvalBench, (p, 3)); ) |
| 284 DEF_BENCH( return SkNEW_ARGS(RRectBench, (p, 1)); ) | 284 DEF_BENCH( return SkNEW_ARGS(RRectBench, (p, 1)); ) |
| 285 DEF_BENCH( return SkNEW_ARGS(RRectBench, (p, 1, 4)); ) |
| 285 DEF_BENCH( return SkNEW_ARGS(RRectBench, (p, 3)); ) | 286 DEF_BENCH( return SkNEW_ARGS(RRectBench, (p, 3)); ) |
| 287 DEF_BENCH( return SkNEW_ARGS(RRectBench, (p, 3, 4)); ) |
| 286 DEF_BENCH( return SkNEW_ARGS(PointsBench, (p, SkCanvas::kPoints_PointMode, "poin
ts")); ) | 288 DEF_BENCH( return SkNEW_ARGS(PointsBench, (p, SkCanvas::kPoints_PointMode, "poin
ts")); ) |
| 287 DEF_BENCH( return SkNEW_ARGS(PointsBench, (p, SkCanvas::kLines_PointMode, "lines
")); ) | 289 DEF_BENCH( return SkNEW_ARGS(PointsBench, (p, SkCanvas::kLines_PointMode, "lines
")); ) |
| 288 DEF_BENCH( return SkNEW_ARGS(PointsBench, (p, SkCanvas::kPolygon_PointMode, "pol
ygon")); ) | 290 DEF_BENCH( return SkNEW_ARGS(PointsBench, (p, SkCanvas::kPolygon_PointMode, "pol
ygon")); ) |
| 289 | 291 |
| 290 DEF_BENCH( return SkNEW_ARGS(SrcModeRectBench, (p)); ) | 292 DEF_BENCH( return SkNEW_ARGS(SrcModeRectBench, (p)); ) |
| 291 DEF_BENCH( return SkNEW_ARGS(AARectBench, (p)); ) | 293 DEF_BENCH( return SkNEW_ARGS(AARectBench, (p)); ) |
| 292 | 294 |
| 293 /* init the blitmask bench | 295 /* init the blitmask bench |
| 294 */ | 296 */ |
| 295 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, | 297 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, |
| 296 (p, SkCanvas::kPoints_PointMode, | 298 (p, SkCanvas::kPoints_PointMode, |
| 297 BlitMaskBench::kMaskOpaque, "maskopaque") | 299 BlitMaskBench::kMaskOpaque, "maskopaque") |
| 298 ); ) | 300 ); ) |
| 299 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, | 301 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, |
| 300 (p, SkCanvas::kPoints_PointMode, | 302 (p, SkCanvas::kPoints_PointMode, |
| 301 BlitMaskBench::kMaskBlack, "maskblack") | 303 BlitMaskBench::kMaskBlack, "maskblack") |
| 302 ); ) | 304 ); ) |
| 303 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, | 305 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, |
| 304 (p, SkCanvas::kPoints_PointMode, | 306 (p, SkCanvas::kPoints_PointMode, |
| 305 BlitMaskBench::kMaskColor, "maskcolor") | 307 BlitMaskBench::kMaskColor, "maskcolor") |
| 306 ); ) | 308 ); ) |
| 307 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, | 309 DEF_BENCH( return SkNEW_ARGS(BlitMaskBench, |
| 308 (p, SkCanvas::kPoints_PointMode, | 310 (p, SkCanvas::kPoints_PointMode, |
| 309 BlitMaskBench::KMaskShader, "maskshader") | 311 BlitMaskBench::KMaskShader, "maskshader") |
| 310 ); ) | 312 ); ) |
| OLD | NEW |