Removal of dependencies on PlatformDevice classes.

ui/gfx/blit.cc

 // 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"
@@ skipping 17 matching lines @@
 bool HasClipOrTransform(const skia::PlatformCanvas& canvas) {
   if (!canvas.getTotalMatrix().isIdentity())
     return true;
 
   const SkRegion& clip_region = canvas.getTotalClip();
   if (clip_region.isEmpty() || clip_region.isComplex())
     return true;
 
   // Now we know the clip is a regular rectangle, make sure it covers the
   // entire canvas.
-  const SkBitmap& bitmap = canvas.getTopPlatformDevice().accessBitmap(false);
+  const SkBitmap& bitmap = canvas.getTopDevice().accessBitmap(false);
   const SkIRect& clip_bounds = clip_region.getBounds();
   if (clip_bounds.fLeft != 0 || clip_bounds.fTop != 0 ||
       clip_bounds.fRight != bitmap.width() ||
       clip_bounds.fBottom != bitmap.height())
     return true;
 
   return false;
 }
 
 }  // namespace
@@ skipping 39 matching lines @@
   cairo_clip(dst_context);
   cairo_paint(dst_context);
   cairo_restore(dst_context);
 #endif
 }
 
 void BlitContextToCanvas(skia::PlatformCanvas *dst_canvas,
                          const Rect& dst_rect,
                          NativeDrawingContext src_context,
                          const Point& src_origin) {
-  BlitContextToContext(dst_canvas->beginPlatformPaint(), dst_rect,
+  BlitContextToContext(skia::BeginPlatformPaint(dst_canvas), dst_rect,
                        src_context, src_origin);
-  dst_canvas->endPlatformPaint();
+  skia::EndPlatformPaint(dst_canvas);
 }
 
 void BlitCanvasToContext(NativeDrawingContext dst_context,
                          const Rect& dst_rect,
                          skia::PlatformCanvas *src_canvas,
                          const Point& src_origin) {
   BlitContextToContext(dst_context, dst_rect,
-                       src_canvas->beginPlatformPaint(), src_origin);
-  src_canvas->endPlatformPaint();
+                       skia::BeginPlatformPaint(src_canvas), src_origin);
+  skia::EndPlatformPaint(src_canvas);
 }
 
 void BlitCanvasToCanvas(skia::PlatformCanvas *dst_canvas,
                         const Rect& dst_rect,
                         skia::PlatformCanvas *src_canvas,
                         const Point& src_origin) {
-  BlitContextToContext(dst_canvas->beginPlatformPaint(), dst_rect,
-                       src_canvas->beginPlatformPaint(), src_origin);
-  src_canvas->endPlatformPaint();
-  dst_canvas->endPlatformPaint();
+  BlitContextToContext(skia::BeginPlatformPaint(dst_canvas), dst_rect,
+                       skia::BeginPlatformPaint(src_canvas), src_origin);
+  skia::EndPlatformPaint(src_canvas);
+  skia::EndPlatformPaint(dst_canvas);
 }
 
 #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();
+  skia::ScopedPlatformPaint scoped_platform_paint(canvas);
+  HDC hdc = scoped_platform_paint.GetPlatformSurface();
 
   RECT damaged_rect;
   RECT r = clip.ToRECT();
   ScrollDC(hdc, amount.x(), amount.y(), NULL, &r, NULL, &damaged_rect);
-
-  canvas->endPlatformPaint();
 }
 
 #elif defined(OS_POSIX)
 // Cairo has no nice scroll function so we do our own. On Mac it's possible to
 // use platform scroll code, but it's complex so we just use the same path
 // here. Either way it will be software-only, so it shouldn't matter much.
 
 void ScrollCanvas(skia::PlatformCanvas* canvas,
                   const gfx::Rect& in_clip,
                   const gfx::Point& amount) {
   DCHECK(!HasClipOrTransform(*canvas));  // Don't support special stuff.
   SkBitmap& bitmap = const_cast<SkBitmap&>(
-      canvas->getTopPlatformDevice().accessBitmap(true));
+      canvas->getTopDevice().accessBitmap(true));
   SkAutoLockPixels lock(bitmap);
 
   // We expect all coords to be inside the canvas, so clip here.
   gfx::Rect clip = in_clip.Intersect(
       gfx::Rect(0, 0, bitmap.width(), bitmap.height()));
 
   // Compute the set of pixels we'll actually end up painting.
   gfx::Rect dest_rect = clip;
   dest_rect.Offset(amount);
   dest_rect = dest_rect.Intersect(clip);
@@ skipping 27 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