Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2090)

Unified Diff: bench/benchmain.cpp

Issue 22978012: Split SkDevice into SkBaseDevice and SkBitmapDevice (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Updating to ToT (10994) Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « bench/MergeBench.cpp ('k') | debugger/QT/SkRasterWidget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/benchmain.cpp
===================================================================
--- bench/benchmain.cpp (revision 10994)
+++ bench/benchmain.cpp (working copy)
@@ -199,9 +199,9 @@
kPDF_Backend,
};
-static SkDevice* make_device(SkBitmap::Config config, const SkIPoint& size,
- Backend backend, int sampleCount, GrContext* context) {
- SkDevice* device = NULL;
+static SkBaseDevice* make_device(SkBitmap::Config config, const SkIPoint& size,
+ Backend backend, int sampleCount, GrContext* context) {
+ SkBaseDevice* device = NULL;
SkBitmap bitmap;
bitmap.setConfig(config, size.fX, size.fY);
@@ -209,7 +209,7 @@
case kRaster_Backend:
bitmap.allocPixels();
erase(bitmap);
- device = SkNEW_ARGS(SkDevice, (bitmap));
+ device = SkNEW_ARGS(SkBitmapDevice, (bitmap));
break;
#if SK_SUPPORT_GPU
case kGPU_Backend: {
@@ -780,7 +780,7 @@
glContext = gContextFactory.getGLContext(gConfigs[configIndex].fContextType);
}
#endif
- SkDevice* device = NULL;
+ SkBaseDevice* device = NULL;
SkCanvas* canvas = NULL;
SkPicture pictureRecordFrom;
SkPicture pictureRecordTo;
« no previous file with comments | « bench/MergeBench.cpp ('k') | debugger/QT/SkRasterWidget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698