rename getBitmapDC to beginPlatformPaint and add calls to endPlatformPaint

ui/gfx/blit.cc

-// Copyright (c) 2009 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 "ui/gfx/blit.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_device.h"
 #include "ui/gfx/point.h"
@@ skipping 72 matching lines @@
   cairo_set_source_surface(dst_context, cairo_get_target(src_context),
                            dst_rect.x()-surface_x, dst_rect.y()-surface_y);
   cairo_rectangle(dst_context, dst_rect.x(), dst_rect.y(),
                   dst_rect.width(), dst_rect.height());
   cairo_clip(dst_context);
   cairo_paint(dst_context);
   cairo_restore(dst_context);
 #endif
 }
 
-static NativeDrawingContext GetContextFromCanvas(
-    skia::PlatformCanvas *canvas) {
-  skia::PlatformDevice& device = canvas->getTopPlatformDevice();
-#if defined(OS_WIN)
-  return device.getBitmapDC();
-#elif defined(OS_MACOSX)
-  return device.GetBitmapContext();
-#else  // Linux, BSD, others
-  return device.beginPlatformPaint();
-#endif
-}
-
 void BlitContextToCanvas(skia::PlatformCanvas *dst_canvas,
                          const Rect& dst_rect,
                          NativeDrawingContext src_context,
                          const Point& src_origin) {
-  BlitContextToContext(GetContextFromCanvas(dst_canvas), dst_rect,
+  BlitContextToContext(dst_canvas->beginPlatformPaint(), dst_rect,
                        src_context, src_origin);
+  dst_canvas->endPlatformPaint();
 }
 
 void BlitCanvasToContext(NativeDrawingContext dst_context,
                          const Rect& dst_rect,
                          skia::PlatformCanvas *src_canvas,
                          const Point& src_origin) {
   BlitContextToContext(dst_context, dst_rect,
-                       GetContextFromCanvas(src_canvas), src_origin);
+                       src_canvas->beginPlatformPaint(), src_origin);
+  src_canvas->endPlatformPaint();
 }
 
 void BlitCanvasToCanvas(skia::PlatformCanvas *dst_canvas,
                         const Rect& dst_rect,
                         skia::PlatformCanvas *src_canvas,
                         const Point& src_origin) {
-  BlitContextToContext(GetContextFromCanvas(dst_canvas), dst_rect,
-                       GetContextFromCanvas(src_canvas), src_origin);
+  BlitContextToContext(dst_canvas->beginPlatformPaint(), dst_rect,
+                       src_canvas->beginPlatformPaint(), src_origin);
+  src_canvas->endPlatformPaint();
+  dst_canvas->endPlatformPaint();
 }
 
 #if defined(OS_WIN)
 
 void ScrollCanvas(skia::PlatformCanvas* canvas,
                   const gfx::Rect& clip,
                   const gfx::Point& amount) {
   DCHECK(!HasClipOrTransform(*canvas));  // Don't support special stuff.
   HDC hdc = canvas->beginPlatformPaint();
 
@@ skipping 55 matching lines @@
       memmove(bitmap.getAddr32(dest_rect.x(), dest_rect.y() + y),
               bitmap.getAddr32(src_rect.x(), src_rect.y() + y),
               row_bytes);
     }
   }
 }
 
 #endif
 
 }  // namespace gfx