Skia r10995 landed the SkDevice refactoring in Skia. This CL rolls up to that point (from 10991) and updates some of Chromium that either changed since the original Chromium-side changes (cc & skia/ext) or was known to need changing at this point (printing)

cc:              danakj
printing:        vandebo
skia:            bsalomon, reed, or rmistry

R=danakj@chromium.org, reed@google.com, vandebo@chromium.org

Review URL: https://codereview.chromium.org/23636005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220321 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 13 deletions

diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index 5ba7ea6..66298b2 100644
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -248,11 +248,6 @@ void BitmapPlatformDevice::DrawToNativeContext(CGContextRef context, int x,
     data_->ReleaseBitmapContext();
 }
 
-const SkBitmap& BitmapPlatformDevice::onAccessBitmap(SkBitmap* bitmap) {
-  // Not needed in CoreGraphics
-  return *bitmap;
-}
-
 SkBaseDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
     SkBitmap::Config config, int width, int height, bool isOpaque,
     Usage /*usage*/) {
diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h
index d2d6fae..07b0084 100644
--- a/skia/ext/bitmap_platform_device_mac.h
+++ b/skia/ext/bitmap_platform_device_mac.h
@@ -68,11 +68,6 @@ class SK_API BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice
   BitmapPlatformDevice(const skia::RefPtr<BitmapPlatformDeviceData>& data,
                        const SkBitmap& bitmap);
 
-  // Flushes the CoreGraphics context so that the pixel data can be accessed
-  // directly by Skia. Overridden from SkBaseDevice, this is called when Skia
-  // starts accessing pixel data.
-  virtual const SkBitmap& onAccessBitmap(SkBitmap*) OVERRIDE;
-
   virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config, int width,
                                                  int height, bool isOpaque,
                                                  Usage usage) OVERRIDE;
diff --git a/skia/ext/bitmap_platform_device_win.cc b/skia/ext/bitmap_platform_device_win.cc
index 8da09d1..0088403 100644
--- a/skia/ext/bitmap_platform_device_win.cc
+++ b/skia/ext/bitmap_platform_device_win.cc
@@ -293,12 +293,12 @@ void BitmapPlatformDevice::DrawToNativeContext(HDC dc, int x, int y,
     data_->ReleaseBitmapDC();
 }
 
-const SkBitmap& BitmapPlatformDevice::onAccessBitmap(SkBitmap* bitmap) {
+const SkBitmap& BitmapPlatformDevice::onAccessBitmap() {
   // FIXME(brettw) OPTIMIZATION: We should only flush if we know a GDI
   // operation has occurred on our DC.
   if (data_->IsBitmapDCCreated())
     GdiFlush();
-  return *bitmap;
+  return SkBitmapDevice::onAccessBitmap();
 }
 
 SkBaseDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index fa313f6..1261e51 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -68,7 +68,7 @@ class SK_API BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice
   // Flushes the Windows device context so that the pixel data can be accessed
   // directly by Skia. Overridden from SkBaseDevice, this is called when Skia
   // starts accessing pixel data.
-  virtual const SkBitmap& onAccessBitmap(SkBitmap* bitmap) OVERRIDE;
+  virtual const SkBitmap& onAccessBitmap() OVERRIDE;
 
   virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config, int width,
                                                  int height, bool isOpaque,