Removal of dependencies on PlatformDevice classes.

skia/ext/platform_canvas_unittest.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.
 
 // TODO(awalker): clean up the const/non-const reference handling in this test
 
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)
 #import <ApplicationServices/ApplicationServices.h>
@@ skipping 13 matching lines @@
 
 namespace {
 
 // Return true if the canvas is filled to canvas_color, and contains a single
 // rectangle filled to rect_color. This function ignores the alpha channel,
 // since Windows will sometimes clear the alpha channel when drawing, and we
 // will fix that up later in cases it's necessary.
 bool VerifyRect(const PlatformCanvas& canvas,
                 uint32_t canvas_color, uint32_t rect_color,
                 int x, int y, int w, int h) {
-  PlatformDevice& device = canvas.getTopPlatformDevice();
-  const SkBitmap& bitmap = device.accessBitmap(false);
+  SkDevice* device = skia::GetTopDevice(canvas);
+  const SkBitmap& bitmap = device->accessBitmap(false);
   SkAutoLockPixels lock(bitmap);
 
   // For masking out the alpha values.
   uint32_t alpha_mask = 0xFF << SK_A32_SHIFT;
 
   for (int cur_y = 0; cur_y < bitmap.height(); cur_y++) {
     for (int cur_x = 0; cur_x < bitmap.width(); cur_x++) {
       if (cur_x >= x && cur_x < x + w &&
           cur_y >= y && cur_y < y + h) {
         // Inside the square should be rect_color
@@ skipping 17 matching lines @@
   static uint32_t alpha_mask = 0xFF << SK_A32_SHIFT;
   return (*bitmap.getAddr32(x, y) | alpha_mask) == (color | alpha_mask);
 }
 
 // Return true if canvas has something that passes for a rounded-corner
 // rectangle. Basically, we're just checking to make sure that the pixels in the
 // middle are of rect_color and pixels in the corners are of canvas_color.
 bool VerifyRoundedRect(const PlatformCanvas& canvas,
                        uint32_t canvas_color, uint32_t rect_color,
                        int x, int y, int w, int h) {
-  PlatformDevice& device = canvas.getTopPlatformDevice();
-  const SkBitmap& bitmap = device.accessBitmap(false);
+  SkDevice* device = skia::GetTopDevice(canvas);
+  const SkBitmap& bitmap = device->accessBitmap(false);
   SkAutoLockPixels lock(bitmap);
 
   // Check corner points first. They should be of canvas_color.
   if (!IsOfColor(bitmap, x, y, canvas_color)) return false;
   if (!IsOfColor(bitmap, x + w, y, canvas_color)) return false;
   if (!IsOfColor(bitmap, x, y + h, canvas_color)) return false;
   if (!IsOfColor(bitmap, x + w, y, canvas_color)) return false;
 
   // Check middle points. They should be of rect_color.
   if (!IsOfColor(bitmap, (x + w / 2), y, rect_color)) return false;
@@ skipping 11 matching lines @@
   return VerifyRect(canvas, SK_ColorWHITE, SK_ColorBLACK, x, y, w, h);
 }
 
 // Check that every pixel in the canvas is a single color.
 bool VerifyCanvasColor(const PlatformCanvas& canvas, uint32_t canvas_color) {
   return VerifyRect(canvas, canvas_color, 0, 0, 0, 0, 0);
 }
 
 #if defined(OS_WIN)
 void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) {
-  HDC dc = canvas.beginPlatformPaint();
+  skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
+  HDC dc = scoped_platform_paint.GetPlatformSurface();
 
   RECT inner_rc;
   inner_rc.left = x;
   inner_rc.top = y;
   inner_rc.right = x + w;
   inner_rc.bottom = y + h;
   FillRect(dc, &inner_rc, reinterpret_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)));
-
-  canvas.endPlatformPaint();
 }
 #elif defined(OS_MACOSX)
 void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) {
-  CGContextRef context = canvas.beginPlatformPaint();
-  
+  skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
+  CGContextRef context = scoped_platform_paint.GetPlatformSurface();
+
   CGRect inner_rc = CGRectMake(x, y, w, h);
   // RGBA opaque black
   CGColorRef black = CGColorCreateGenericRGB(0.0, 0.0, 0.0, 1.0);
   CGContextSetFillColorWithColor(context, black);
   CGColorRelease(black);
   CGContextFillRect(context, inner_rc);
-  
-  canvas.endPlatformPaint();
 }
 #else
 void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) {
   notImplemented();
 }
 #endif
 
 // Clips the contents of the canvas to the given rectangle. This will be
 // intersected with any existing clip.
 void AddClip(PlatformCanvas& canvas, int x, int y, int w, int h) {
@@ skipping 98 matching lines @@
   // Create the canvas initialized to opaque white.
   PlatformCanvas canvas(16, 16, true);
 
   // Make a layer and fill it completely to make sure that the bounds are
   // correct.
   canvas.drawColor(SK_ColorWHITE);
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+    MakeOpaque(&canvas, 0, 0, 100, 100);
 #endif
   }
   EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX, kLayerY, kLayerW, kLayerH));
 
   // Make a layer and fill it partially to make sure the translation is correct.
   canvas.drawColor(SK_ColorWHITE);
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
-                                             kInnerW, kInnerH);
+    MakeOpaque(&canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #endif
   }
   EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 
   // Add a clip on the layer and fill to make sure clip is correct.
   canvas.drawColor(SK_ColorWHITE);
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas.save();
     AddClip(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(
-        kInnerX, kInnerY, kInnerW, kInnerH);
+    MakeOpaque(&canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #endif
     canvas.restore();
   }
   EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 
   // Add a clip and then make the layer to make sure the clip is correct.
   canvas.drawColor(SK_ColorWHITE);
   canvas.save();
   AddClip(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+    MakeOpaque(&canvas, 0, 0, 100, 100);
 #endif
   }
   canvas.restore();
   EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
 }
 
 // Test that translation + make layer works properly.
 TEST(PlatformCanvas, TranslateLayer) {
   // Create the canvas initialized to opaque white.
   PlatformCanvas canvas(16, 16, true);
 
   // Make a layer and fill it completely to make sure that the bounds are
   // correct.
   canvas.drawColor(SK_ColorWHITE);
   canvas.save();
   canvas.translate(1, 1);
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+    MakeOpaque(&canvas, 0, 0, 100, 100);
 #endif
   }
   canvas.restore();
   EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX + 1, kLayerY + 1,
                               kLayerW, kLayerH));
 
   // Translate then make the layer.
   canvas.drawColor(SK_ColorWHITE);
   canvas.save();
   canvas.translate(1, 1);
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
-                                             kInnerW, kInnerH);
+    MakeOpaque(&canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #endif
   }
   canvas.restore();
   EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 1, kInnerY + 1,
                               kInnerW, kInnerH));
 
   // Make the layer then translate.
   canvas.drawColor(SK_ColorWHITE);
   canvas.save();
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas.translate(1, 1);
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
-                                             kInnerW, kInnerH);
+    MakeOpaque(&canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #endif
   }
   canvas.restore();
   EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 1, kInnerY + 1,
                               kInnerW, kInnerH));
 
   // Translate both before and after, and have a clip.
   canvas.drawColor(SK_ColorWHITE);
   canvas.save();
   canvas.translate(1, 1);
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas.drawColor(SK_ColorWHITE);
     canvas.translate(1, 1);
     AddClip(canvas, kInnerX + 1, kInnerY + 1, kInnerW - 1, kInnerH - 1);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kLayerX, kLayerY,
-                                             kLayerW, kLayerH);
+    MakeOpaque(&canvas, kLayerX, kLayerY, kLayerW, kLayerH);
 #endif
   }
   canvas.restore();
   EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX + 3, kInnerY + 3,
                               kInnerW - 1, kInnerH - 1));
 
 // TODO(dglazkov): Figure out why this fails on Mac (antialiased clipping?),
 // modify test and remove this guard.
 #if !defined(OS_MACOSX)
   // Translate both before and after, and have a path clip.
   canvas.drawColor(SK_ColorWHITE);
   canvas.save();
   canvas.translate(1, 1);
   {
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     canvas.drawColor(SK_ColorWHITE);
     canvas.translate(1, 1);
 
     SkPath path;
     SkRect rect;
     rect.iset(kInnerX - 1, kInnerY - 1,
               kInnerX + kInnerW, kInnerY + kInnerH);
     path.addRoundRect(rect, kRadius, kRadius);
     canvas.clipPath(path);
 
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kLayerX, kLayerY,
-                                             kLayerW, kLayerH);
+    MakeOpaque(&canvas, kLayerX, kLayerY, kLayerW, kLayerH);
 #endif
   }
   canvas.restore();
   EXPECT_TRUE(VerifyRoundedRect(canvas, SK_ColorWHITE, SK_ColorBLACK,
                                 kInnerX + 1, kInnerY + 1, kInnerW, kInnerH));
 #endif
 }
 
 }  // namespace skia