remove SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG

include/core/SkDevice.h

 
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkDevice_DEFINED
 #define SkDevice_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkDeviceProperties.h"
 #include "SkImageFilter.h"
 
-// getDeviceCapabilities() is not called by skia, but this flag keeps it around
-// for clients that have "override" annotations on their subclass. These overrides
-// should be deleted.
-//#define SK_SUPPORT_LEGACY_GETDEVICECAPABILITIES
-
-//#define SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
-
 class SkClipStack;
 class SkDraw;
 struct SkIRect;
 class SkMatrix;
 class SkMetaData;
 class SkRegion;
 
 class GrRenderTarget;
 
 class SK_API SkBaseDevice : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkBaseDevice)
 
     /**
      *  Construct a new device.
     */
     SkBaseDevice();
 
     /**
      *  Construct a new device.
     */
     SkBaseDevice(const SkDeviceProperties& deviceProperties);
 
     virtual ~SkBaseDevice();
 
-#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
-    /**
-     *  Creates a device that is of the same type as this device (e.g. SW-raster,
-     *  GPU, or PDF). The backing store for this device is created automatically
-     *  (e.g. offscreen pixels or FBO or whatever is appropriate).
-     *
-     *  @param width    width of the device to create
-     *  @param height   height of the device to create
-     *  @param isOpaque performance hint, set to true if you know that you will
-     *                  draw into this device such that all of the pixels will
-     *                  be opaque.
-     */
-    SkBaseDevice* createCompatibleDevice(SkBitmap::Config config,
-                                         int width, int height,
-                                         bool isOpaque);
-#endif
     SkBaseDevice* createCompatibleDevice(const SkImageInfo&);
 
     SkMetaData& getMetaData();
 
-#ifdef SK_SUPPORT_LEGACY_GETDEVICECAPABILITIES
-    enum Capabilities {
-        kVector_Capability = 0x1,
-    };
-    virtual uint32_t getDeviceCapabilities() { return 0; }
-#endif
-
     /** Return the width of the device (in pixels).
     */
     virtual int width() const = 0;
     /** Return the height of the device (in pixels).
     */
     virtual int height() const = 0;
 
     /** Return the image properties of the device. */
     virtual const SkDeviceProperties& getDeviceProperties() const {
         //Currently, all the properties are leaky.
@@ skipping 311 matching lines @@
     // but cannot change the width/height, so there should be no change to
     // any clip information.
     // TODO: move to SkBitmapDevice
     virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) = 0;
 
     // just called by SkCanvas when built as a layer
     void setOrigin(int x, int y) { fOrigin.set(x, y); }
     // just called by SkCanvas for saveLayer
     SkBaseDevice* createCompatibleDeviceForSaveLayer(const SkImageInfo&);
 
-#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
-    /**
-     * Justs exists during the period where clients still "override" this
-     *  signature. They are supported by our base-impl calling this old
-     *  signature from the new one (using ImageInfo).
-     */
-    virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config config,
-                                                   int width, int height,
-                                                   bool isOpaque, Usage) {
-        return NULL;
-    }
-#endif
     virtual SkBaseDevice* onCreateDevice(const SkImageInfo&, Usage) {
         return NULL;
     }
 
     /** Causes any deferred drawing to the device to be completed.
      */
     virtual void flush() = 0;
 
     SkIPoint    fOrigin;
     SkMetaData* fMetaData;
 
 #ifdef SK_DEBUG
     bool        fAttachedToCanvas;
 #endif
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif