roll skia

skia/ext/bitmap_platform_device_mac.cc

 // Copyright (c) 2010 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"
 
 #include <time.h>
 
 #include "base/mac/mac_util.h"
 #include "base/ref_counted.h"
@@ skipping 200 matching lines @@
   data_->ref();
   return *this;
 }
 
 CGContextRef BitmapPlatformDevice::GetBitmapContext() {
   data_->LoadConfig();
   return data_->bitmap_context();
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
+                                         const SkRegion& region,
+                                         const SkClipStack&) {
   data_->SetMatrixClip(transform, region);
 }
 
 void BitmapPlatformDevice::DrawToContext(CGContextRef context, int x, int y,
                                          const CGRect* src_rect) {
   bool created_dc = false;
   if (!data_->bitmap_context()) {
     created_dc = true;
     GetBitmapContext();
   }
@@ skipping 31 matching lines @@
   SkAutoLockPixels lock(bitmap);
   uint32_t* data = bitmap.getAddr32(0, 0);
   return static_cast<SkColor>(data[x + y * width()]);
 }
 
 void BitmapPlatformDevice::onAccessBitmap(SkBitmap*) {
   // Not needed in CoreGraphics
 }
 
 }  // namespace skia