From 1f2f338e23789f3eef168dcbd8171a28820ba6c1 Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Thu, 29 Aug 2013 11:54:56 +0000 Subject: Split SkDevice into SkBaseDevice and SkBitmapDevice https://codereview.chromium.org/22978012/ git-svn-id: http://skia.googlecode.com/svn/trunk@10995 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/MergeBench.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bench/MergeBench.cpp') diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index 3639c954a2..992507d9b5 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ #include "SkBenchmark.h" +#include "SkBitmapDevice.h" #include "SkBitmapSource.h" #include "SkCanvas.h" -#include "SkDevice.h" #include "SkMergeImageFilter.h" #define FILTER_WIDTH_SMALL SkIntToScalar(32) @@ -53,7 +53,7 @@ private: void make_bitmap() { fBitmap.setConfig(SkBitmap::kARGB_8888_Config, 80, 80); fBitmap.allocPixels(); - SkDevice device(fBitmap); + SkBitmapDevice device(fBitmap); SkCanvas canvas(&device); canvas.clear(0x00000000); SkPaint paint; @@ -67,7 +67,7 @@ private: void make_checkerboard() { fCheckerboard.setConfig(SkBitmap::kARGB_8888_Config, 80, 80); fCheckerboard.allocPixels(); - SkDevice device(fCheckerboard); + SkBitmapDevice device(fCheckerboard); SkCanvas canvas(&device); canvas.clear(0x00000000); SkPaint darkPaint; -- cgit v1.2.3