Start hiding deprecated skia/ext/ functions

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 66 matching lines @@
     }
   }
   return true;
 }
 
 #if !defined(USE_AURA) && !defined(OS_MACOSX)
 // 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 SkCanvas& canvas,
+                       SkBaseDevice* device,

[f(malita), 2016/08/30 17:41:23]

Nit: since device is always derived from canvas, it could be misleading to
expose as an explicit param.  Can we use canvas.getTopDevice(true) on the fly
instead?

[tomhudson, 2016/08/30 17:48:48]

D'oh, yes.

                        uint32_t canvas_color,
                        uint32_t rect_color,
                        int x,
                        int y,
                        int w,
                        int h) {
-  SkBaseDevice* 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.
@@ skipping 295 matching lines @@
     const SkScalar kRadius = 2.0;
     path.addRoundRect(rect, kRadius, kRadius);
     canvas->clipPath(path);
 
     DrawNativeRect(*canvas, 0, 0, 100, 100);
 #if defined(OS_WIN)
     MakeOpaque(canvas.get(), kLayerX, kLayerY, kLayerW, kLayerH);
 #endif
   }
   canvas->restore();
-  EXPECT_TRUE(VerifyRoundedRect(*canvas, SK_ColorWHITE, SK_ColorBLACK,
+  EXPECT_TRUE(VerifyRoundedRect(*canvas, canvas->getTopDevice(true),
+                                SK_ColorWHITE, SK_ColorBLACK,
                                 kInnerX + 1, kInnerY + 1, kInnerW, kInnerH));
 #endif
 }
 
 #endif  // #if !defined(USE_AURA)
 
 }  // namespace skia