roll skia

skia/ext/bitmap_platform_device_mac_unittest.cc

Index: skia/ext/bitmap_platform_device_mac_unittest.cc
===================================================================
--- skia/ext/bitmap_platform_device_mac_unittest.cc	(revision 76211)
+++ skia/ext/bitmap_platform_device_mac_unittest.cc	(working copy)
@@ -9,6 +9,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkRegion.h"
+#include "third_party/skia/include/core/SkClipStack.h"
 
 namespace skia {
 
@@ -29,11 +30,12 @@
   SkMatrix transform;
   transform.setTranslate(50, 140);
 
+  SkClipStack ignore;
   SkRegion clip_region;
   SkIRect rect;
   rect.set(0, 0, kWidth, kHeight);
   clip_region.setRect(rect);
-  bitmap_->setMatrixClip(transform, clip_region);
+  bitmap_->setMatrixClip(transform, clip_region, ignore);
 
   CGContextRef context = bitmap_->GetBitmapContext();
   SkRect clip_rect = gfx::CGRectToSkRect(CGContextGetClipBoundingBox(context));
@@ -48,11 +50,12 @@
   SkMatrix transform;
   transform.setScale(0.5, 0.5);
 
+  SkClipStack unused;
   SkRegion clip_region;
   SkIRect rect;
   rect.set(0, 0, kWidth, kHeight);
   clip_region.setRect(rect);
-  bitmap_->setMatrixClip(transform, clip_region);
+  bitmap_->setMatrixClip(transform, clip_region, unused);
 
   CGContextRef context = bitmap_->GetBitmapContext();
   SkRect clip_rect = gfx::CGRectToSkRect(CGContextGetClipBoundingBox(context));