Skia DEPS roll to 3147

skia/ext/bitmap_platform_device_mac.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/bitmap_platform_device_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #include <time.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 215 matching lines @@
     bounds.size.width = width();
     bounds.size.height = height();
     CGContextDrawImage(context, bounds, image);
   }
   CGImageRelease(image);
 
   if (created_dc)
     data_->ReleaseBitmapContext();
 }
 
-void BitmapPlatformDevice::onAccessBitmap(SkBitmap*) {
+const SkBitmap& BitmapPlatformDevice::onAccessBitmap(SkBitmap* bitmap) {
   // Not needed in CoreGraphics
+  return *bitmap;
 }
 
 SkDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
     SkBitmap::Config config, int width, int height, bool isOpaque,
     Usage /*usage*/) {
   SkASSERT(config == SkBitmap::kARGB_8888_Config);
   return BitmapPlatformDevice::Create(NULL, width, height, isOpaque);
 }
 
 }  // namespace skia