diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-09 14:24:59 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-09 14:24:59 +0000 |
| commit | 4293209b7871151b5d88ced42ac855182d569499 (patch) | |
| tree | de16229971587258dc717ffbd95d2426a9347a5d | |
| parent | a908820c5b0aedab6a303178996bd55a5f046125 (diff) | |
| download | include-4293209b7871151b5d88ced42ac855182d569499.tar.gz | |
Removing deprecated constructors and setDevice from SkDeferredCanvas
R=senorblanco@google.com, senorblanco@chromium.org
BUR=crbug.com/270143
Author: junov@chromium.org
Review URL: https://chromiumcodereview.appspot.com/22385011
git-svn-id: http://skia.googlecode.com/svn/trunk/include@10657 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | utils/SkDeferredCanvas.h | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/utils/SkDeferredCanvas.h b/utils/SkDeferredCanvas.h index f961605..77229a7 100644 --- a/utils/SkDeferredCanvas.h +++ b/utils/SkDeferredCanvas.h @@ -15,11 +15,6 @@ class DeferredDevice; class SkImage; class SkSurface; -#if !defined(SK_DEFERRED_CANVAS_USES_FACTORIES) -// This is temporary, for rolling the API change into Chromium/Blink -#define SK_DEFERRED_CANVAS_USES_FACTORIES 0 -#endif - /** \class SkDeferredCanvas Subclass of SkCanvas that encapsulates an SkPicture or SkGPipe for deferred drawing. The main difference between this class and SkPictureRecord (the @@ -38,42 +33,10 @@ public: */ static SkDeferredCanvas* Create(SkSurface* surface); -#ifdef SK_DEVELOPER - static SkDeferredCanvas* Create(SkDevice* device); // Used for testing -#endif - -#if !SK_DEFERRED_CANVAS_USES_FACTORIES - /** DEPRECATED - */ - SkDeferredCanvas(); - - /** DEPRACATED, use create instead - Construct a canvas with the specified device to draw into. - Equivalent to calling default constructor, then setDevice. - @param device Specifies a device for the canvas to draw into. - */ - explicit SkDeferredCanvas(SkDevice* device); - - /** DEPRECATED, use create instead - Construct a canvas with the specified surface to draw into. - This constructor must be used for newImageSnapshot to work. - @param surface Specifies a surface for the canvas to draw into. - */ - explicit SkDeferredCanvas(SkSurface* surface); -#endif + static SkDeferredCanvas* Create(SkDevice* device); virtual ~SkDeferredCanvas(); - /** DEPRECATED - * Specify a device to be used by this canvas. Calling setDevice will - * release the previously set device, if any. Takes a reference on the - * device. - * - * @param device The device that the canvas will raw into - * @return The device argument, for convenience. - */ - virtual SkDevice* setDevice(SkDevice* device); - /** * Specify the surface to be used by this canvas. Calling setSurface will * release the previously set surface or device. Takes a reference on the |