diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 20:06:40 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 20:06:40 +0000 |
commit | 9b051a375ba6d6b61cea98f35834cd032aaa5347 (patch) | |
tree | cea9d4aab32afcbbc193455a78a49b6d231e0a39 /bench/MergeBench.cpp | |
parent | 8cee797901763ab0922eb9ef484cfdcbc94bee54 (diff) |
Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready.
git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench/MergeBench.cpp')
-rw-r--r-- | bench/MergeBench.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index 170b84908d..3639c954a2 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -53,7 +53,7 @@ private: void make_bitmap() { fBitmap.setConfig(SkBitmap::kARGB_8888_Config, 80, 80); fBitmap.allocPixels(); - SkBitmapDevice device(fBitmap); + SkDevice 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(); - SkBitmapDevice device(fCheckerboard); + SkDevice device(fCheckerboard); SkCanvas canvas(&device); canvas.clear(0x00000000); SkPaint darkPaint; |