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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gm/gmmain.cpp

Issue 22385011: Removing deprecated constructors and setDevice from SkDeferredCanvas (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: 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/benchmain.cpp ('k') | include/utils/SkDeferredCanvas.h » ('j') | include/utils/SkDeferredCanvas.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/gmmain.cpp
===================================================================
--- gm/gmmain.cpp (revision 10642)
+++ gm/gmmain.cpp (working copy)
@@ -519,11 +519,7 @@
if (gRec.fBackend == kRaster_Backend) {
SkAutoTUnref<SkDevice> device(SkNEW_ARGS(SkDevice, (*bitmap)));
if (deferred) {
-#if SK_DEFERRED_CANVAS_USES_FACTORIES
canvas.reset(SkDeferredCanvas::Create(device));
-#else
- canvas.reset(SkNEW_ARGS(SkDeferredCanvas, (device)));
-#endif
} else {
canvas.reset(SkNEW_ARGS(SkCanvas, (device)));
}
@@ -534,11 +530,7 @@
else { // GPU
SkAutoTUnref<SkDevice> device(SkGpuDevice::Create(gpuTarget));
if (deferred) {
-#if SK_DEFERRED_CANVAS_USES_FACTORIES
canvas.reset(SkDeferredCanvas::Create(device));
-#else
- canvas.reset(SkNEW_ARGS(SkDeferredCanvas, (device)));
-#endif
} else {
canvas.reset(SkNEW_ARGS(SkCanvas, (device)));
}
« no previous file with comments | « bench/benchmain.cpp ('k') | include/utils/SkDeferredCanvas.h » ('j') | include/utils/SkDeferredCanvas.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698