roll skia

Review URL: http://codereview.chromium.org/6588012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76216 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 29 insertions, 13 deletions

diff --git a/skia/ext/bitmap_platform_device_linux.cc b/skia/ext/bitmap_platform_device_linux.cc
index 4164d93..dab2122 100644
--- a/skia/ext/bitmap_platform_device_linux.cc
+++ b/skia/ext/bitmap_platform_device_linux.cc
@@ -164,7 +164,8 @@ cairo_t* BitmapPlatformDevice::beginPlatformPaint() {
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
+                                         const SkRegion& region,
+                                         const SkClipStack&) {
   data_->SetMatrixClip(transform, region);
 }
 
diff --git a/skia/ext/bitmap_platform_device_linux.h b/skia/ext/bitmap_platform_device_linux.h
index 3a2d71dc..b4011ac 100644
--- a/skia/ext/bitmap_platform_device_linux.h
+++ b/skia/ext/bitmap_platform_device_linux.h
@@ -92,7 +92,8 @@ class BitmapPlatformDevice : public PlatformDevice {
 
   // 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();
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index 5a25abf..75f2f71 100644
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -218,7 +218,8 @@ CGContextRef BitmapPlatformDevice::GetBitmapContext() {
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
+                                         const SkRegion& region,
+                                         const SkClipStack&) {
   data_->SetMatrixClip(transform, region);
 }
 
diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h
index 5723c85..06be3f6 100644
--- a/skia/ext/bitmap_platform_device_mac.h
+++ b/skia/ext/bitmap_platform_device_mac.h
@@ -64,7 +64,8 @@ class BitmapPlatformDevice : public PlatformDevice {
   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);
diff --git a/skia/ext/bitmap_platform_device_mac_unittest.cc b/skia/ext/bitmap_platform_device_mac_unittest.cc
index 3330440..dfd1360 100644
--- a/skia/ext/bitmap_platform_device_mac_unittest.cc
+++ b/skia/ext/bitmap_platform_device_mac_unittest.cc
@@ -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 @@ TEST_F(BitmapPlatformDeviceMacTest, ClipRectTransformWithTranslate) {
   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 @@ TEST_F(BitmapPlatformDeviceMacTest, ClipRectTransformWithScale) {
   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));
diff --git a/skia/ext/bitmap_platform_device_win.cc b/skia/ext/bitmap_platform_device_win.cc
index 3d407f0f..c812e84 100644
--- a/skia/ext/bitmap_platform_device_win.cc
+++ b/skia/ext/bitmap_platform_device_win.cc
@@ -206,7 +206,8 @@ HDC BitmapPlatformDevice::getBitmapDC() {
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
+                                         const SkRegion& region,
+                                         const SkClipStack&) {
   data_->SetMatrixClip(transform, region);
 }
 
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index ffaad81..87a2e1d0 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -79,7 +79,8 @@ class BitmapPlatformDevice : public PlatformDevice {
 
   // Loads the given transform and clipping region into the HDC. This is
   // overridden from SkDevice.
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
+                             const SkClipStack&);
 
   virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
   virtual void makeOpaque(int x, int y, int width, int height);
diff --git a/skia/ext/vector_platform_device_linux.cc b/skia/ext/vector_platform_device_linux.cc
index 39dca8b..068ae89 100644
--- a/skia/ext/vector_platform_device_linux.cc
+++ b/skia/ext/vector_platform_device_linux.cc
@@ -484,7 +484,8 @@ void VectorPlatformDevice::drawVertices(const SkDraw& draw,
 }
 
 void VectorPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
+                                         const SkRegion& region,
+                                         const SkClipStack&) {
   clip_region_ = region;
   if (!clip_region_.isEmpty())
     LoadClipRegion(clip_region_);
diff --git a/skia/ext/vector_platform_device_linux.h b/skia/ext/vector_platform_device_linux.h
index 8504e60..222f68f 100644
--- a/skia/ext/vector_platform_device_linux.h
+++ b/skia/ext/vector_platform_device_linux.h
@@ -79,7 +79,8 @@ class VectorPlatformDevice : public PlatformDevice {
   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();
 
diff --git a/skia/ext/vector_platform_device_win.cc b/skia/ext/vector_platform_device_win.cc
index 6ec4e39..2476152 100644
--- a/skia/ext/vector_platform_device_win.cc
+++ b/skia/ext/vector_platform_device_win.cc
@@ -415,7 +415,8 @@ bool VectorPlatformDevice::ApplyPaint(const SkPaint& paint) {
 }
 
 void VectorPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                 const SkRegion& region) {
+                                 const SkRegion& region,
+                                 const SkClipStack&) {
   transform_ = transform;
   LoadTransformToDC(hdc_, transform_);
   clip_region_ = region;
diff --git a/skia/ext/vector_platform_device_win.h b/skia/ext/vector_platform_device_win.h
index 3050a90..6045f24 100644
--- a/skia/ext/vector_platform_device_win.h
+++ b/skia/ext/vector_platform_device_win.h
@@ -76,7 +76,8 @@ class VectorPlatformDevice : public PlatformDevice {
                           const SkPaint&) OVERRIDE;
 
 
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region);
+  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
+                             const SkClipStack&);
   virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
   virtual bool IsVectorial() { return true; }
 
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 6e8f714..dee63a6 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -29,6 +29,7 @@
         '../third_party/skia/gpu/src/GrMatrix.cpp',
         '../third_party/skia/gpu/src/GrMemory.cpp',
         '../third_party/skia/gpu/src/GrPath.cpp',
+        '../third_party/skia/gpu/src/GrPathRenderer.cpp',
         '../third_party/skia/gpu/src/GrRectanizer_fifo.cpp',
         '../third_party/skia/gpu/src/GrGpuGLShaders2.cpp',
         '../third_party/skia/gpu/src/GrTextureCache.cpp',
@@ -68,6 +69,7 @@
         '../third_party/skia/gpu/include/GrPaint.h',
         '../third_party/skia/gpu/include/GrPath.h',
         '../third_party/skia/gpu/include/GrPathIter.h',
+        '../third_party/skia/gpu/include/GrPathRenderer.h',
         '../third_party/skia/gpu/include/GrPathSink.h',
         '../third_party/skia/gpu/include/GrPoint.h',
         '../third_party/skia/gpu/include/GrRandom.h',
@@ -284,6 +286,7 @@
         '../third_party/skia/src/core/SkBuffer.cpp',
         '../third_party/skia/src/core/SkCanvas.cpp',
         '../third_party/skia/src/core/SkChunkAlloc.cpp',
+        '../third_party/skia/src/core/SkClipStack.cpp',
         '../third_party/skia/src/core/SkColor.cpp',
         '../third_party/skia/src/core/SkColorFilter.cpp',
         '../third_party/skia/src/core/SkColorTable.cpp',
@@ -348,7 +351,6 @@
         '../third_party/skia/src/core/SkQuadClipper.h',
         '../third_party/skia/src/core/SkRasterizer.cpp',
         '../third_party/skia/src/core/SkRect.cpp',
-        '../third_party/skia/src/core/SkRefCnt.cpp',
         '../third_party/skia/src/core/SkRefDict.cpp',
         '../third_party/skia/src/core/SkRegion.cpp',
         '../third_party/skia/src/core/SkRegionPriv.h',
@@ -491,6 +493,7 @@
         '../third_party/skia/include/core/SkBuffer.h',
         '../third_party/skia/include/core/SkCanvas.h',
         '../third_party/skia/include/core/SkChunkAlloc.h',
+        '../third_party/skia/include/core/SkClipStack.h',
         '../third_party/skia/include/core/SkColor.h',
         '../third_party/skia/include/core/SkColorFilter.h',
         '../third_party/skia/include/core/SkColorPriv.h',