rename getBitmapDC to beginPlatformPaint and add calls to endPlatformPaint

skia/ext/bitmap_platform_device_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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"
 #include "third_party/skia/include/core/SkMatrix.h"
@@ skipping 182 matching lines @@
   data_->unref();
 }
 
 BitmapPlatformDevice& BitmapPlatformDevice::operator=(
     const BitmapPlatformDevice& other) {
   data_ = other.data_;
   data_->ref();
   return *this;
 }
 
-HDC BitmapPlatformDevice::getBitmapDC() {
+HDC BitmapPlatformDevice::beginPlatformPaint() {
   return data_->GetBitmapDC();
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
                                          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();
+  HDC source_dc = beginPlatformPaint();
 
   RECT temp_rect;
   if (!src_rect) {
     temp_rect.left = 0;
     temp_rect.right = width();
     temp_rect.top = 0;
     temp_rect.bottom = height();
     src_rect = &temp_rect;
   }
 
@@ skipping 26 matching lines @@
                   copy_height,
                   source_dc,
                   src_rect->left,
                   src_rect->top,
                   copy_width,
                   copy_height,
                   blend_function);
   }
   LoadTransformToDC(source_dc, data_->transform());
 
+  endPlatformPaint();
   if (created_dc)
     data_->ReleaseBitmapDC();
 }
 
 // Returns the color value at the specified location.
 SkColor BitmapPlatformDevice::getColorAt(int x, int y) {
   const SkBitmap& bitmap = accessBitmap(false);
   SkAutoLockPixels lock(bitmap);
   uint32_t* data = bitmap.getAddr32(0, 0);
   return static_cast<SkColor>(data[x + y * width()]);
 }
 
 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