roll skia

skia/ext/bitmap_platform_device_linux.h

 // Copyright (c) 2011 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_LINUX_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_
 #pragma once
 
 #include "base/ref_counted.h"
 #include "skia/ext/platform_device_linux.h"
@@ skipping 74 matching lines @@
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque);
 
   // This doesn't take ownership of |data|
   static BitmapPlatformDevice* Create(int width, int height,
                                       bool is_opaque, uint8_t* data);
 
   virtual void makeOpaque(int x, int y, int width, int height);
 
   // Overridden from SkDevice:
   virtual SkDeviceFactory* getDeviceFactory();
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
+                             const SkClipStack&);
 
   // Overridden from PlatformDevice:
   virtual bool IsVectorial();
   virtual cairo_t* beginPlatformPaint();
 
  private:
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
                                       cairo_surface_t* surface);
 
   scoped_refptr<BitmapPlatformDeviceData> data_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_LINUX_H_