From 1d20cdf4cb74b3a1b47c7bd62d3e3d17be4c6013 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Wed, 16 Feb 2011 18:09:28 +0000 Subject: Fix some of the more common chromium-style errors on the mac clang builder. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6525038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75141 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/ext/bitmap_platform_device_mac.cc | 8 ++++++++ skia/ext/bitmap_platform_device_mac.h | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'skia/ext') diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc index 8435dbe..5a25abf 100644 --- a/skia/ext/bitmap_platform_device_mac.cc +++ b/skia/ext/bitmap_platform_device_mac.cc @@ -201,6 +201,10 @@ BitmapPlatformDevice::~BitmapPlatformDevice() { data_->unref(); } +SkDeviceFactory* BitmapPlatformDevice::getDeviceFactory() { + return SkNEW(BitmapPlatformDeviceFactory); +} + BitmapPlatformDevice& BitmapPlatformDevice::operator=( const BitmapPlatformDevice& other) { data_ = other.data_; @@ -249,6 +253,10 @@ void BitmapPlatformDevice::DrawToContext(CGContextRef context, int x, int y, data_->ReleaseBitmapContext(); } +bool BitmapPlatformDevice::IsVectorial() { + return false; +} + // Returns the color value at the specified location. SkColor BitmapPlatformDevice::getColorAt(int x, int y) { const SkBitmap& bitmap = accessBitmap(true); diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h index 20d8918..5723c85 100644 --- a/skia/ext/bitmap_platform_device_mac.h +++ b/skia/ext/bitmap_platform_device_mac.h @@ -58,9 +58,7 @@ class BitmapPlatformDevice : public PlatformDevice { BitmapPlatformDevice(const BitmapPlatformDevice& other); virtual ~BitmapPlatformDevice(); - virtual SkDeviceFactory* getDeviceFactory() { - return SkNEW(BitmapPlatformDeviceFactory); - } + virtual SkDeviceFactory* getDeviceFactory(); // See warning for copy constructor above. BitmapPlatformDevice& operator=(const BitmapPlatformDevice& other); @@ -71,7 +69,7 @@ class BitmapPlatformDevice : public PlatformDevice { virtual void DrawToContext(CGContextRef context, int x, int y, const CGRect* src_rect); virtual void makeOpaque(int x, int y, int width, int height); - virtual bool IsVectorial() { return false; } + virtual bool IsVectorial(); // Returns the color value at the specified location. This does not // consider any transforms that may be set on the device. -- cgit v1.1