getDeviceCapabilities is no longer need, so remove it

include/core/SkDevice.h

Index: include/core/SkDevice.h
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index b3be78085f483b890b0dc941854456914a20d602..1773d0ac18abc86119b7c0c607e4c82c01b736d2 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -16,6 +16,11 @@
 #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;
@@ -63,10 +68,9 @@ public:
 
     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).
     */