roll skia

skia/ext/vector_platform_device_linux.cc

 // Copyright (c) 2009 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.
 
 #include "skia/ext/vector_platform_device.h"
 
 #include <cairo.h>
 #include <cairo-ft.h>
 
 #include <ft2build.h>
@@ skipping 466 matching lines @@
                                         const SkColor colors[],
                                         SkXfermode* xmode,
                                         const uint16_t indices[],
                                         int indexCount,
                                         const SkPaint& paint) {
   // This function isn't used in the code. Verify this assumption.
   SkASSERT(false);
 }
 
 void VectorPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
+                                         const SkRegion& region,
+                                         const SkClipStack&) {
   clip_region_ = region;
   if (!clip_region_.isEmpty())
     LoadClipRegion(clip_region_);
 
   transform_ = transform;
   LoadTransformToContext(transform_);
 }
 
 void VectorPlatformDevice::ApplyPaintColor(const SkPaint& paint) {
   SkColor color = paint.getColor();
@@ skipping 198 matching lines @@
     DCHECK(it->second.font_stream);
 
     cairo_font_face_destroy(it->second.cairo_face);
     // |it->second.ft_face| is handled by Cairo.
     it->second.font_stream->unref();
   }
   g_font_cache->clear();
 }
 
 }  // namespace skia