hide virtuals on device for width/height/isopaque

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
 
@@ skipping 26 matching lines @@
      *  Construct a new device.
     */
     SkBaseDevice(const SkDeviceProperties& deviceProperties);
 
     virtual ~SkBaseDevice();
 
     SkBaseDevice* createCompatibleDevice(const SkImageInfo&);
 
     SkMetaData& getMetaData();
 
-    /** 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.
         return fLeakyProperties;
     }
 
     /**
      *  Return ImageInfo for this device. If the canvas is not backed by pixels
      *  (cpu or gpu), then the info's ColorType will be kUnknown_SkColorType.
      */
     virtual SkImageInfo imageInfo() const;
 
     /**
      *  Return the bounds of the device in the coordinate space of the root
      *  canvas. The root device will have its top-left at 0,0, but other devices
      *  such as those associated with saveLayer may have a non-zero origin.
      */
     void getGlobalBounds(SkIRect* bounds) const {
         SkASSERT(bounds);
         const SkIPoint& origin = this->getOrigin();
         bounds->setXYWH(origin.x(), origin.y(), this->width(), this->height());
     }
 
-    /** Returns true if the device's bitmap's config treats every pixel as
-        implicitly opaque.
-    */
-    virtual bool isOpaque() const = 0;
+#ifdef SK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE
+    virtual int width() const {
+        return this->imageInfo().width();
+    }
+    virtual int height() const {
+        return this->imageInfo().height();
+    }
+    virtual bool isOpaque() const {
+        return this->imageInfo().isOpaque();
+    }
+#else
+    int width() const {
+        return this->imageInfo().width();
+    }
+    int height() const {
+        return this->imageInfo().height();
+    }
+    bool isOpaque() const {
+        return this->imageInfo().isOpaque();
+    }
+#endif
 
     /** Return the bitmap associated with this device. Call this each time you need
         to access the bitmap, as it notifies the subclass to perform any flushing
         etc. before you examine the pixels.
         @param changePixels set to true if the caller plans to change the pixels
         @return the device's bitmap
     */
     const SkBitmap& accessBitmap(bool changePixels);
 
     bool writePixels(const SkImageInfo&, const void*, size_t rowBytes, int x, int y);
@@ skipping 298 matching lines @@
     SkMetaData* fMetaData;
 
 #ifdef SK_DEBUG
     bool        fAttachedToCanvas;
 #endif
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif