Move the device capability method to SkDevice.

These are not the capabilities of the factory, but of the device.  Additionally, it is more often needed when you have a device then when you have a factory, which caused creating of a new factory.

Review URL: http://codereview.appspot.com/2720041

git-svn-id: http://skia.googlecode.com/svn/trunk@618 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 9 insertions, 8 deletions

diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index 3932ad35c5..0ff3241776 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -38,19 +38,12 @@ class SkDeviceFactory {
 public:
     virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
                                 bool isOpaque, bool isForLayer) = 0;
-
-    enum Capabilities {
-        kGL_Capability    = 0x1,  //!< mask to indicate this device supports GL
-        kAll_Capabilities = 0x1
-    };
-    virtual uint32_t getDeviceCapabilities() = 0;
 };
 
 class SkRasterDeviceFactory : public SkDeviceFactory {
 public:
     virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
                                 bool isOpaque, bool isForLayer);
-    virtual uint32_t getDeviceCapabilities() { return 0; }
 };
 
 class SkDevice : public SkRefCnt {
@@ -68,6 +61,13 @@ public:
         return SkNEW(SkRasterDeviceFactory);
     }
 
+    enum Capabilities {
+        kGL_Capability     = 0x1,  //!< mask indicating GL support
+        kVector_Capability = 0x2,  //!< mask indicating a vector representation
+        kAll_Capabilities  = 0x3
+    };
+    virtual uint32_t getDeviceCapabilities() { return 0; }
+
     /** Return the width of the device (in pixels).
     */
     virtual int width() const { return fBitmap.width(); }
diff --git a/include/pdf/SkPDFDevice.h b/include/pdf/SkPDFDevice.h
index fb74c63a1b..b972dd4752 100644
--- a/include/pdf/SkPDFDevice.h
+++ b/include/pdf/SkPDFDevice.h
@@ -31,7 +31,6 @@ class SkPDFStream;
 class SkPDFDeviceFactory : public SkDeviceFactory {
     virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height,
                                 bool isOpaque, bool isForLayer);
-    virtual uint32_t getDeviceCapabilities() { return 0; }
 };
 
 /** \class SkPDFDevice
@@ -52,6 +51,8 @@ public:
         return SkNEW(SkPDFDeviceFactory);
     }
 
+    virtual uint32_t getDeviceCapabilities() { return kVector_Capability; }
+
     virtual int width() const { return fWidth; };
 
     virtual int height() const { return fHeight; };