roll skia

skia/ext/bitmap_platform_device_mac.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
 #pragma once
 
 #include "skia/ext/platform_device_mac.h"
 
@@ skipping 46 matching lines @@
   // around to another routine willing to deal with the bitmap data directly.
   BitmapPlatformDevice(const BitmapPlatformDevice& other);
   virtual ~BitmapPlatformDevice();
 
   virtual SkDeviceFactory* getDeviceFactory();
 
   // See warning for copy constructor above.
   BitmapPlatformDevice& operator=(const BitmapPlatformDevice& other);
 
   virtual CGContextRef GetBitmapContext();
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
+                             const SkClipStack&);
 
   virtual void DrawToContext(CGContextRef context, int x, int y,
                              const CGRect* src_rect);
   virtual void makeOpaque(int x, int y, int width, int height);
   virtual bool IsVectorial();
 
   // Returns the color value at the specified location. This does not
   // consider any transforms that may be set on the device.
   SkColor getColorAt(int x, int y);
 
@@ skipping 12 matching lines @@
   virtual void onAccessBitmap(SkBitmap*);
 
   // Data associated with this device, guaranteed non-null. We hold a reference
   // to this object.
   BitmapPlatformDeviceData* data_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_