1 files changed, 0 insertions, 44 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index fcc28d5b9a..142748c0cd 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -30,28 +30,6 @@ class SkMatrix;
 class SkMetaData;
 class SkRegion;
 
-/** \class SkDeviceFactory
-
-    DEPRECATED: Will be replaced by SkDevice::createCompatibleDevice
-
-    Devices that extend SkDevice should also provide a SkDeviceFactory class
-    to pass into SkCanvas.  Doing so will eliminate the need to extend
-    SkCanvas as well.
-*/
-class SK_API SkDeviceFactory : public SkRefCnt {
-public:
-    SkDeviceFactory();
-    virtual ~SkDeviceFactory();
-    virtual SkDevice* newDevice(SkCanvas*, SkBitmap::Config, int width,
-                                int height, bool isOpaque, bool isLayer) = 0;
-};
-
-class SkRasterDeviceFactory : public SkDeviceFactory {
-public:
-    virtual SkDevice* newDevice(SkCanvas*, SkBitmap::Config, int width,
-                                int height, bool isOpaque, bool isLayer);
-};
-
 class SK_API SkDevice : public SkRefCnt {
 public:
 //    SkDevice();
@@ -81,15 +59,6 @@ public:
     virtual ~SkDevice();
 
     /**
-     *  DEPRECATED: Will be replaced by SkDevice::createCompatibleDevice
-     *
-     *  Return the factory that will create this subclass of SkDevice.
-     *  The returned factory is cached by the device, and so its reference count
-     *  is not changed by this call.
-     */
-    SkDeviceFactory* getDeviceFactory();
-
-    /**
      *  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).
@@ -282,17 +251,6 @@ public:
     virtual bool filterTextFlags(const SkPaint& paint, TextFlags*);
 
 protected:
-    /**
-     *  DEPRECATED: Will be replaced by SkDevice::createCompatibleDevice
-     *
-     *  subclasses can override this to return a new (or ref'd) instance of
-     *  a device factory that will create this subclass of device. This value
-     *  is cached, so it should get called at most once for a given instance.
-     *
-     *  If not overriden then createCompatibleDevice will be used by canvas.
-     */
-    virtual SkDeviceFactory* onNewDeviceFactory();
-
     /** Update as needed the pixel value in the bitmap, so that the caller can access
         the pixels directly. Note: only the pixels field should be altered. The config/width/height/rowbytes
         must remain unchanged.
@@ -330,8 +288,6 @@ private:
     SkBitmap    fBitmap;
     SkIPoint    fOrigin;
     SkMetaData* fMetaData;
-
-    SkDeviceFactory* fCachedDeviceFactory;
 };
 
 #endif