| Index: src/utils/SkDeferredCanvas.cpp
|
| diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
|
| index 27627ab82ec90a992108368c1cfe476d81730413..1cb6d3766ad623f5947a196ccd773a2fd49ff129 100644
|
| --- a/src/utils/SkDeferredCanvas.cpp
|
| +++ b/src/utils/SkDeferredCanvas.cpp
|
| @@ -140,7 +140,6 @@ void DeferredPipeController::playback(bool silent) {
|
| // FIXME: Derive from SkBaseDevice.
|
| class DeferredDevice : public SkBitmapDevice {
|
| public:
|
| - explicit DeferredDevice(SkBaseDevice* immediateDevice);
|
| explicit DeferredDevice(SkSurface* surface);
|
| ~DeferredDevice();
|
|
|
| @@ -254,17 +253,6 @@ private:
|
| size_t fBitmapSizeThreshold;
|
| };
|
|
|
| -DeferredDevice::DeferredDevice(SkBaseDevice* immediateDevice)
|
| - : SkBitmapDevice(SkBitmap::kNo_Config,
|
| - immediateDevice->width(), immediateDevice->height(),
|
| - immediateDevice->isOpaque(),
|
| - immediateDevice->getDeviceProperties()) {
|
| - fSurface = NULL;
|
| - fImmediateCanvas = SkNEW_ARGS(SkCanvas, (immediateDevice));
|
| - fPipeController.setPlaybackCanvas(fImmediateCanvas);
|
| - this->init();
|
| -}
|
| -
|
| DeferredDevice::DeferredDevice(SkSurface* surface)
|
| : SkBitmapDevice(SkBitmap::kNo_Config,
|
| surface->getCanvas()->getDevice()->width(),
|
| @@ -551,11 +539,6 @@ SkDeferredCanvas* SkDeferredCanvas::Create(SkSurface* surface) {
|
| return SkNEW_ARGS(SkDeferredCanvas, (deferredDevice));
|
| }
|
|
|
| -SkDeferredCanvas* SkDeferredCanvas::Create(SkBaseDevice* device) {
|
| - SkAutoTUnref<DeferredDevice> deferredDevice(SkNEW_ARGS(DeferredDevice, (device)));
|
| - return SkNEW_ARGS(SkDeferredCanvas, (deferredDevice));
|
| -}
|
| -
|
| SkDeferredCanvas::SkDeferredCanvas(DeferredDevice* device) : SkCanvas (device) {
|
| this->init();
|
| }
|
|
|