diff options
| author | epoger@chromium.org <epoger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 14:49:30 +0000 |
|---|---|---|
| committer | epoger@chromium.org <epoger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 14:49:30 +0000 |
| commit | 0a2d9130b60baaa140d2cfd572376b722c436ccb (patch) | |
| tree | 4d9d4c06fea85e2c7abb1f77fd08ea48a67e3497 /skia/ext | |
| parent | d479727aebc869a1feeb7f8d341efcca997cb269 (diff) | |
| download | chromium_src-0a2d9130b60baaa140d2cfd572376b722c436ccb.zip chromium_src-0a2d9130b60baaa140d2cfd572376b722c436ccb.tar.gz chromium_src-0a2d9130b60baaa140d2cfd572376b722c436ccb.tar.bz2 | |
Skia DEPS roll to 3147
Review URL: https://chromiumcodereview.appspot.com/9346023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
| -rw-r--r-- | skia/ext/bitmap_platform_device_mac.cc | 3 | ||||
| -rw-r--r-- | skia/ext/bitmap_platform_device_mac.h | 2 | ||||
| -rw-r--r-- | skia/ext/bitmap_platform_device_win.cc | 3 | ||||
| -rw-r--r-- | skia/ext/bitmap_platform_device_win.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc index 6c4043d..3c87fad 100644 --- a/skia/ext/bitmap_platform_device_mac.cc +++ b/skia/ext/bitmap_platform_device_mac.cc @@ -233,8 +233,9 @@ void BitmapPlatformDevice::DrawToNativeContext(CGContextRef context, int x, data_->ReleaseBitmapContext(); } -void BitmapPlatformDevice::onAccessBitmap(SkBitmap*) { +const SkBitmap& BitmapPlatformDevice::onAccessBitmap(SkBitmap* bitmap) { // Not needed in CoreGraphics + return *bitmap; } SkDevice* BitmapPlatformDevice::onCreateCompatibleDevice( diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h index a6b98f0..f57a36e 100644 --- a/skia/ext/bitmap_platform_device_mac.h +++ b/skia/ext/bitmap_platform_device_mac.h @@ -61,7 +61,7 @@ class BitmapPlatformDevice : public PlatformDevice, public SkDevice { // Flushes the CoreGraphics context so that the pixel data can be accessed // directly by Skia. Overridden from SkDevice, this is called when Skia // starts accessing pixel data. - virtual void onAccessBitmap(SkBitmap*) OVERRIDE; + virtual const SkBitmap& onAccessBitmap(SkBitmap*) OVERRIDE; virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config, int width, int height, bool isOpaque, diff --git a/skia/ext/bitmap_platform_device_win.cc b/skia/ext/bitmap_platform_device_win.cc index 3c39f10..bcfb366 100644 --- a/skia/ext/bitmap_platform_device_win.cc +++ b/skia/ext/bitmap_platform_device_win.cc @@ -247,11 +247,12 @@ void BitmapPlatformDevice::DrawToNativeContext(HDC dc, int x, int y, data_->ReleaseBitmapDC(); } -void BitmapPlatformDevice::onAccessBitmap(SkBitmap* bitmap) { +const SkBitmap& BitmapPlatformDevice::onAccessBitmap(SkBitmap* bitmap) { // FIXME(brettw) OPTIMIZATION: We should only flush if we know a GDI // operation has occurred on our DC. if (data_->IsBitmapDCCreated()) GdiFlush(); + return *bitmap; } SkDevice* BitmapPlatformDevice::onCreateCompatibleDevice( diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h index a5415c9..57f94b6 100644 --- a/skia/ext/bitmap_platform_device_win.h +++ b/skia/ext/bitmap_platform_device_win.h @@ -62,7 +62,7 @@ class SK_API BitmapPlatformDevice : public PlatformDevice, public SkDevice { // Flushes the Windows device context so that the pixel data can be accessed // directly by Skia. Overridden from SkDevice, this is called when Skia // starts accessing pixel data. - virtual void onAccessBitmap(SkBitmap* bitmap) OVERRIDE; + virtual const SkBitmap& onAccessBitmap(SkBitmap* bitmap) OVERRIDE; virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config, int width, int height, bool isOpaque, |