roll skia

skia/ext/vector_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_VECTOR_PLATFORM_DEVICE_LINUX_H_
 #define SKIA_EXT_VECTOR_PLATFORM_DEVICE_LINUX_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "skia/ext/platform_device.h"
@@ skipping 61 matching lines @@
                               const SkPaint& paint) OVERRIDE;
   virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode,
                             int vertexCount,
                             const SkPoint verts[], const SkPoint texs[],
                             const SkColor colors[], SkXfermode* xmode,
                             const uint16_t indices[], int indexCount,
                             const SkPaint& paint) OVERRIDE;
   virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
                           const SkPaint&) OVERRIDE;
 
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
+                             const SkClipStack&);
   virtual PlatformSurface beginPlatformPaint();
   virtual bool IsVectorial();
 
  protected:
   explicit VectorPlatformDevice(PlatformSurface context,
                                 const SkBitmap& bitmap);
 
  private:
   // Apply paint's color in the context.
   void ApplyPaintColor(const SkPaint& paint);
@@ skipping 36 matching lines @@
   PlatformSurface context_;
 
   // Copy & assign are not supported.
   VectorPlatformDevice(const VectorPlatformDevice&);
   const VectorPlatformDevice& operator=(const VectorPlatformDevice&);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_VECTOR_PLATFORM_DEVICE_LINUX_H_