From 56b9875e3dcb7b7c3a28cc0bfd50784dfcd45dc1 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Wed, 27 Oct 2010 16:56:57 +0000 Subject: Roll Skia deps to r621. Move device capabilities from device factories to the device class itself. (Skia r618) Cleanup: remove the Sk prefix from our device factories and inherit from SkDeviceFactory instead of SkRasterDeviceFactory (no real change). BUG=None TEST=None Review URL: http://codereview.chromium.org/4143002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64086 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/ext/bitmap_platform_device_mac.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'skia/ext/bitmap_platform_device_mac.h') diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h index 68c717c..484d923 100644 --- a/skia/ext/bitmap_platform_device_mac.h +++ b/skia/ext/bitmap_platform_device_mac.h @@ -10,7 +10,7 @@ namespace skia { -class SkBitmapPlatformDeviceFactory : public SkRasterDeviceFactory { +class BitmapPlatformDeviceFactory : public SkDeviceFactory { public: virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height, bool isOpaque, bool isForLayer); @@ -58,7 +58,7 @@ class BitmapPlatformDevice : public PlatformDevice { virtual ~BitmapPlatformDevice(); virtual SkDeviceFactory* getDeviceFactory() { - return SkNEW(SkBitmapPlatformDeviceFactory); + return SkNEW(BitmapPlatformDeviceFactory); } // See warning for copy constructor above. -- cgit v1.1