Removing deprecated constructors and setDevice from SkDeferredCanvas

src/utils/SkDeferredCanvas.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDeferredCanvas.h"
 
@@ skipping 532 matching lines @@
             canvas.setDeferredDrawing(false);
             fCanvas = &canvas;
         } else {
             fCanvas = NULL;
         }
     }
 
     SkDeferredCanvas* fCanvas;
 };
 
-#if !SK_DEFERRED_CANVAS_USES_FACTORIES
-SkDeferredCanvas::SkDeferredCanvas() {
-    this->init();
-}
-
-SkDeferredCanvas::SkDeferredCanvas(SkDevice* device) {
-    this->init();
-    this->setDevice(device);
-}
-
-SkDeferredCanvas::SkDeferredCanvas(SkSurface* surface) {
-    this->init();
-    this->INHERITED::setDevice(SkNEW_ARGS(DeferredDevice, (surface)))->unref();
-}
-#endif
-
 SkDeferredCanvas* SkDeferredCanvas::Create(SkSurface* surface) {
     SkAutoTUnref<DeferredDevice> deferredDevice(SkNEW_ARGS(DeferredDevice, (surface)));
     return SkNEW_ARGS(SkDeferredCanvas, (deferredDevice));
 }
 
-#ifdef SK_DEVELOPER
 SkDeferredCanvas* SkDeferredCanvas::Create(SkDevice* device) {
     SkAutoTUnref<DeferredDevice> deferredDevice(SkNEW_ARGS(DeferredDevice, (device)));
     return SkNEW_ARGS(SkDeferredCanvas, (deferredDevice));
 }
-#endif
 
 SkDeferredCanvas::SkDeferredCanvas(DeferredDevice* device) : SkCanvas (device) {
     this->init();
 }
 
 void SkDeferredCanvas::init() {
     fDeferredDrawing = true; // On by default
 }
 
 void SkDeferredCanvas::setMaxRecordingStorage(size_t maxStorage) {
@@ skipping 65 matching lines @@
 
 void SkDeferredCanvas::silentFlush() {
     if (fDeferredDrawing) {
         this->getDeferredDevice()->flushPendingCommands(kSilent_PlaybackMode);
     }
 }
 
 SkDeferredCanvas::~SkDeferredCanvas() {
 }
 
-SkDevice* SkDeferredCanvas::setDevice(SkDevice* device) {
-#if SK_DEFERRED_CANVAS_USES_FACTORIES
-    SkASSERT(0); // setDevice is deprecated
-#else
-    this->INHERITED::setDevice(SkNEW_ARGS(DeferredDevice, (device)))->unref();
-#endif
-    return device;
-}
-
 SkSurface* SkDeferredCanvas::setSurface(SkSurface* surface) {
     DeferredDevice* deferredDevice = this->getDeferredDevice();
     SkASSERT(NULL != deferredDevice);
     // By swapping the surface into the existing device, we preserve
     // all pending commands, which can help to seamlessly recover from
     // a lost accelerated graphics context.
     deferredDevice->setSurface(surface);
     return surface;
 }
 
@@ skipping 345 matching lines @@
 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) {
     this->drawingCanvas()->setDrawFilter(filter);
     this->INHERITED::setDrawFilter(filter);
     this->recordedDrawCommand();
     return filter;
 }
 
 SkCanvas* SkDeferredCanvas::canvasForDrawIter() {
     return this->drawingCanvas();
 }