Remove skia::ScopedPlatformPaint

skia/ext/platform_canvas_unittest.cc

 // Copyright (c) 2012 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 "skia/ext/platform_canvas.h"
 
 #include <stdint.h>
 
@@ skipping 118 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 SkCanvas& canvas, uint32_t canvas_color) {
   return VerifyRect(canvas, canvas_color, 0, 0, 0, 0, 0);
 }
 
 #if defined(OS_WIN)
 void DrawNativeRect(SkCanvas& canvas, int x, int y, int w, int h) {
-  skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
-  HDC dc = scoped_platform_paint.GetNativeDrawingContext();
+  HDC dc = skia::GetNativeDrawingContext(&canvas);
 
   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)));
 }
 #elif defined(OS_MACOSX)
 void DrawNativeRect(SkCanvas& canvas, int x, int y, int w, int h) {
-  skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
-  CGContextRef context = scoped_platform_paint.GetNativeDrawingContext();
+  CGContextRef context = skia::GetNativeDrawingContext(&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);
 }
 #elif defined(USE_CAIRO)
 void DrawNativeRect(SkCanvas& canvas, int x, int y, int w, int h) {
-  skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
-  cairo_t* context = scoped_platform_paint.GetNativeDrawingContext();
+  cairo_t* context = skia::GetNativeDrawingContext(&canvas);
 
   cairo_rectangle(context, x, y, w, h);
   cairo_set_source_rgb(context, 0.0, 0.0, 0.0);
   cairo_fill(context);
 }
 #else
 void DrawNativeRect(SkCanvas& canvas, int x, int y, int w, int h) {
   NOTIMPLEMENTED();
 }
 #endif
@@ skipping 228 matching lines @@
     DrawNativeRect(*canvas, 0, 0, 100, 100);
     MakeOpaque(canvas.get(), kLayerX, kLayerY, kLayerW, kLayerH);
   }
   canvas->restore();
   EXPECT_TRUE(VerifyRoundedRect(*canvas, SK_ColorWHITE, SK_ColorBLACK,
                                 kInnerX + 1, kInnerY + 1, kInnerW, kInnerH));
 #endif
 }
 
 }  // namespace skia