diff options
| author | Bryce Harrington <bryce@canonical.com> | 2013-11-26 19:15:37 -0800 |
|---|---|---|
| committer | Bryce Harrington <bryce@canonical.com> | 2013-11-26 19:15:37 -0800 |
| commit | d01f172ca15592e2507ce8920621180ed4bb389a (patch) | |
| tree | dabd3c3d1a5e9e0e873c173cb79508dbdc425028 /src/caskbench.cpp | |
| parent | becbc62d1d187d55152eb7adf9057e6611272d1b (diff) | |
Rename skia variables to distinguish from cairo
Diffstat (limited to 'src/caskbench.cpp')
| -rw-r--r-- | src/caskbench.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/caskbench.cpp b/src/caskbench.cpp index cddef90..1ba3132 100644 --- a/src/caskbench.cpp +++ b/src/caskbench.cpp @@ -227,6 +227,8 @@ main (int argc, char *argv[]) caskbench_context_t context; caskbench_result_t result; cairo_surface_t *cairo_surface; + SkBitmap skia_bitmap; + SkPaint skia_paint; context.size = opt.size; context.canvas_width = 800; @@ -247,13 +249,11 @@ main (int argc, char *argv[]) if (!cairo_surface) errx(2, "Could not create a cairo surface\n"); - SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, - context.canvas_width, context.canvas_height); - bitmap.allocPixels(); - SkBitmapDevice device(bitmap); - SkCanvas canvas(&device); - SkPaint paint; + skia_bitmap.setConfig(SkBitmap::kARGB_8888_Config, + context.canvas_width, context.canvas_height); + skia_bitmap.allocPixels(); + SkBitmapDevice device(skia_bitmap); + SkCanvas skia_canvas(&device); // If dry run, just list the test cases if (opt.dry_run) { @@ -263,10 +263,10 @@ main (int argc, char *argv[]) srand(0xdeadbeef); context.cr = cairo_create(cairo_surface); - context.paint = &paint; - context.canvas = &canvas; + context.paint = &skia_paint; + context.canvas = &skia_canvas; context.cairo_surface = cairo_surface; - context.skia_bitmap = &bitmap; + context.skia_bitmap = &skia_bitmap; result.test_case_name = perf_tests[c].name; result.size = 0; |