roll skia

skia/ext/bitmap_platform_device_win.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 <windows.h>
 #include <psapi.h>
 
 #include "skia/ext/bitmap_platform_device_win.h"
 
 #include "skia/ext/bitmap_platform_device_data.h"
@@ skipping 188 matching lines @@
   data_ = other.data_;
   data_->ref();
   return *this;
 }
 
 HDC BitmapPlatformDevice::getBitmapDC() {
   return data_->GetBitmapDC();
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                         const SkRegion& region) {
+                                         const SkRegion& region,
+                                         const SkClipStack&) {
   data_->SetMatrixClip(transform, region);
 }
 
 void BitmapPlatformDevice::drawToHDC(HDC dc, int x, int y,
                                      const RECT* src_rect) {
   bool created_dc = !data_->IsBitmapDCCreated();
   HDC source_dc = getBitmapDC();
 
   RECT temp_rect;
   if (!src_rect) {
@@ skipping 54 matching lines @@
 
 void BitmapPlatformDevice::onAccessBitmap(SkBitmap* bitmap) {
   // FIXME(brettw) OPTIMIZATION: We should only flush if we know a GDI
   // operation has occurred on our DC.
   if (data_->IsBitmapDCCreated())
     GdiFlush();
 }
 
 }  // namespace skia