diff options
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkCanvas.h | 30 | ||||
| -rw-r--r-- | include/core/SkDevice.h | 44 | ||||
| -rw-r--r-- | include/core/SkScalerContext.h | 2 |
3 files changed, 5 insertions, 71 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index a7f01c4b3d..53c13e552e 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -52,15 +52,7 @@ class SkPicture; */ class SK_API SkCanvas : public SkRefCnt { public: - /** - DEPRECATED: Will be replaced by SkDevice::createCompatibleDevice - - Construct a canvas with the given device factory. - @param factory Specify the factory for generating additional devices. - The factory may be null, in which case - SkRasterDeviceFactory will be used. - */ - explicit SkCanvas(SkDeviceFactory* factory = NULL); + SkCanvas(); /** Construct a canvas with the specified device to draw into. The device factory will be retrieved from the passed device. @@ -106,24 +98,8 @@ public: SkDevice* setBitmapDevice(const SkBitmap& bitmap); /** - * DEPRECATED: Will be replaced by SkDevice::createCompatibleDevice - * - * Return the current device factory, or NULL. The reference count of - * the returned factory is not changed. - */ - SkDeviceFactory* getDeviceFactory() const { return fDeviceFactory; } - - /** - * DEPRECATED: Will be replaced by SkDevice::createCompatibleDevice - * - * Replace any existing factory with the specified factory, unrefing the - * previous (if any), and refing the new one (if any). For convenience, - * the factory parameter is also returned. - */ - SkDeviceFactory* setDeviceFactory(SkDeviceFactory*); - - /** - * Shortcut for getDevice()->createCompatibleDevice(...) + * Shortcut for getDevice()->createCompatibleDevice(...). + * If getDevice() == NULL, this method does nothing, and returns NULL. */ SkDevice* createCompatibleDevice(SkBitmap::Config config, int width, int height, 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 diff --git a/include/core/SkScalerContext.h b/include/core/SkScalerContext.h index f1898ebb0d..dc8a7587a0 100644 --- a/include/core/SkScalerContext.h +++ b/include/core/SkScalerContext.h @@ -168,10 +168,12 @@ public: kDevKernText_Flag = 0x02, kGammaForBlack_Flag = 0x04, // illegal to set both Gamma flags kGammaForWhite_Flag = 0x08, // illegal to set both Gamma flags + // together, these two flags resulting in a two bit value which matches // up with the SkPaint::Hinting enum. kHintingBit1_Flag = 0x10, kHintingBit2_Flag = 0x20, + kEmbeddedBitmapText_Flag = 0x40, kEmbolden_Flag = 0x80, kSubpixelPositioning_Flag = 0x100, |