roll skia

skia/ext/vector_platform_device_win.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 <windows.h>
 
 #include "skia/ext/vector_platform_device_win.h"
 
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/skia_utils_win.h"
@@ skipping 397 matching lines @@
 
   // These aren't used in the code. Verify this assumption.
   SkASSERT(!paint.getColorFilter());
   SkASSERT(!paint.getRasterizer());
   // Reuse code to load Win32 Fonts.
   SkASSERT(!paint.getTypeface());
   return true;
 }
 
 void VectorPlatformDevice::setMatrixClip(const SkMatrix& transform,
-                                 const SkRegion& region) {
+                                 const SkRegion& region,
+                                 const SkClipStack&) {
   transform_ = transform;
   LoadTransformToDC(hdc_, transform_);
   clip_region_ = region;
   if (!clip_region_.isEmpty())
     LoadClipRegion();
 }
 
 void VectorPlatformDevice::drawToHDC(HDC dc, int x, int y,
                                      const RECT* src_rect) {
   SkASSERT(false);
@@ skipping 285 matching lines @@
                                 reinterpret_cast<const BITMAPINFO*>(&hdr),
                                 DIB_RGB_COLORS,
                                 SRCCOPY);
     SkASSERT(result);
   }
   Cleanup();
 }
 
 }  // namespace skia