roll skia

skia/ext/bitmap_platform_device_linux.cc

 // Copyright (c) 2010 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/bitmap_platform_device_linux.h"
 
 #include "skia/ext/bitmap_platform_device_data.h"
 
 #include <cairo/cairo.h>
 
@@ skipping 146 matching lines @@
   cairo_surface_t* surface = cairo_get_target(cairo);
   // Tell cairo to flush anything it has pending.
   cairo_surface_flush(surface);
   // Tell Cairo that we (probably) modified (actually, will modify) its pixel
   // buffer directly.
   cairo_surface_mark_dirty(surface);
   return cairo;
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
+                                         const SkRegion& region,
+                                         const SkClipStack&) {
   data_->SetMatrixClip(transform, region);
 }
 
 BitmapPlatformDevice& BitmapPlatformDevice::operator=(
     const BitmapPlatformDevice& other) {
   data_ = other.data_;
   return *this;
 }
 
 }  // namespace skia