getDeviceCapabilities is no longer need, so remove it

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"
 
+// getDeviceCapabilities() is not called by skia, but this flag keeps it around
+// for clients that have "override" annotations on their subclass. These overrides

[vandebo (ex-Chrome), 2014/03/13 17:21:17]

Why not do this first?

[reed1, 2014/03/13 18:15:33]

I will land this Skia change first, which gives a default impl for the method
(so that clients can remove their overrides).

[vandebo (ex-Chrome), 2014/03/13 18:19:56]

Oh, it's pure virtual, I see.

+// 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;
@@ skipping 27 matching lines @@
      *                  be opaque.
      */
     SkBaseDevice* createCompatibleDevice(SkBitmap::Config config,
                                          int width, int height,
                                          bool isOpaque);
 #endif
     SkBaseDevice* createCompatibleDevice(const SkImageInfo&);
 
     SkMetaData& getMetaData();
 
-    enum Capabilities {
-        kVector_Capability = 0x1,  //!< mask indicating a vector representation
-    };
-    virtual uint32_t getDeviceCapabilities() = 0;
+#ifdef SK_SUPPORT_LEGACY_GETDEVICECAPABILITIES
+    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 {
@@ skipping 380 matching lines @@
     SkMetaData* fMetaData;
 
 #ifdef SK_DEBUG
     bool        fAttachedToCanvas;
 #endif
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif