Removal of dependencies on PlatformDevice classes.

skia/ext/platform_canvas_unittest.cc

Index: skia/ext/platform_canvas_unittest.cc
===================================================================
--- skia/ext/platform_canvas_unittest.cc	(revision 85672)
+++ skia/ext/platform_canvas_unittest.cc	(working copy)
@@ -31,7 +31,7 @@
 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();
+  SkDevice& device = canvas.getTopDevice();
   const SkBitmap& bitmap = device.accessBitmap(false);
   SkAutoLockPixels lock(bitmap);
 
@@ -70,7 +70,7 @@
 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();
+  SkDevice& device = canvas.getTopDevice();
   const SkBitmap& bitmap = device.accessBitmap(false);
   SkAutoLockPixels lock(bitmap);
 
@@ -103,7 +103,7 @@
 
 #if defined(OS_WIN)
 void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) {
-  HDC dc = canvas.beginPlatformPaint();
+  HDC dc = skia::BeginPlatformPaint(&canvas);
 
   RECT inner_rc;
   inner_rc.left = x;
@@ -112,20 +112,20 @@
   inner_rc.bottom = y + h;
   FillRect(dc, &inner_rc, reinterpret_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)));
 
-  canvas.endPlatformPaint();
+  skia::EndPlatformPaint(&canvas);
 }
 #elif defined(OS_MACOSX)
 void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) {
-  CGContextRef context = canvas.beginPlatformPaint();
-  
+  CGContextRef context = skia::BeginPlatformPaint(&canvas);
+
   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();
+
+  skia::EndPlatformPaint(&canvas);
 }
 #else
 void DrawNativeRect(PlatformCanvas& canvas, int x, int y, int w, int h) {
@@ -244,7 +244,7 @@
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+    platform_util::MakeOpaque(&canvas.getTopDevice(), 0, 0, 100, 100);
 #endif
   }
   EXPECT_TRUE(VerifyBlackRect(canvas, kLayerX, kLayerY, kLayerW, kLayerH));
@@ -255,8 +255,8 @@
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
-                                             kInnerW, kInnerH);
+    platform_util::MakeOpaque(&canvas.getTopDevice(), kInnerX, kInnerY,

[alokp, 2011/05/19 18:15:15]

platform_util?

[Jeff Timanus, 2011/05/19 20:38:29]

Corrected.  Thanks for catching that.

+                              kInnerW, kInnerH);
 #endif
   }
   EXPECT_TRUE(VerifyBlackRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH));
@@ -269,7 +269,7 @@
     AddClip(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(
+    platform_util::MakeOpaque(&canvas.getTopDevice(),
         kInnerX, kInnerY, kInnerW, kInnerH);
 #endif
     canvas.restore();
@@ -284,7 +284,7 @@
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+    platform_util::MakeOpaque(&canvas.getTopDevice(), 0, 0, 100, 100);
 #endif
   }
   canvas.restore();
@@ -305,7 +305,7 @@
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(0, 0, 100, 100);
+    platform_util::MakeOpaque(&canvas.getTopDevice(), 0, 0, 100, 100);
 #endif
   }
   canvas.restore();
@@ -320,8 +320,8 @@
     LayerSaver layer(canvas, kLayerX, kLayerY, kLayerW, kLayerH);
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
-                                             kInnerW, kInnerH);
+    platform_util::MakeOpaque(&canvas.getTopDevice(), kInnerX, kInnerY,
+                              kInnerW, kInnerH);
 #endif
   }
   canvas.restore();
@@ -336,8 +336,8 @@
     canvas.translate(1, 1);
     DrawNativeRect(canvas, kInnerX, kInnerY, kInnerW, kInnerH);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kInnerX, kInnerY,
-                                             kInnerW, kInnerH);
+    platform_util::MakeOpaque(&canvas.getTopDevice(), kInnerX, kInnerY,
+                              kInnerW, kInnerH);
 #endif
   }
   canvas.restore();
@@ -355,8 +355,8 @@
     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);
+    platform_util::MakeOpaque(&canvas.getTopDevice(), kLayerX, kLayerY,
+                              kLayerW, kLayerH);
 #endif
   }
   canvas.restore();
@@ -384,8 +384,8 @@
 
     DrawNativeRect(canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
-    canvas.getTopPlatformDevice().makeOpaque(kLayerX, kLayerY,
-                                             kLayerW, kLayerH);
+    platform_util::MakeOpaque(&canvas.getTopDevice(), kLayerX, kLayerY,
+                              kLayerW, kLayerH);
 #endif
   }
   canvas.restore();