Make non-rectangular clip region apply in the correct location....

skia/ext/bitmap_platform_device_win.cc

 // Copyright (c) 2006-2008 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_win.h"
 
 #include "SkMatrix.h"
 #include "SkRefCnt.h"
 #include "SkRegion.h"
 #include "SkUtils.h"
@@ skipping 141 matching lines @@
 }
 
 void BitmapPlatformDeviceWin::BitmapPlatformDeviceWinData::LoadConfig() {
   if (!config_dirty_ || !hdc_)
     return;  // Nothing to do.
   config_dirty_ = false;
 
   // Transform.
   SkMatrix t(transform_);
   LoadTransformToDC(hdc_, t);
-  // We don't use transform_ for the clipping region since the translation is
-  // already applied to offset_x_ and offset_y_.
-  t.reset();
   LoadClippingRegionToDC(hdc_, clip_region_, t);
 }
 
 // We use this static factory function instead of the regular constructor so
 // that we can create the pixel data before calling the constructor. This is
 // required so that we can call the base class' constructor with the pixel
 // data.
 BitmapPlatformDeviceWin* BitmapPlatformDeviceWin::create(
     HDC screen_dc,
     int width,
@@ skipping 190 matching lines @@
 
 void BitmapPlatformDeviceWin::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