accessBitmap is no longer called/needed

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 84 matching lines @@
 // 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,
                        uint32_t canvas_color,
                        uint32_t rect_color,
                        int x,
                        int y,
                        int w,
                        int h) {
-  SkBaseDevice* device = canvas.getTopDevice(true);
-  const SkBitmap& bitmap = device->accessBitmap(false);
-  SkAutoLockPixels lock(bitmap);
+  SkBitmap bitmap;
+  bitmap.allocN32Pixels(w, h);
+  if (!canvas.readPixels(&bitmap, x, y)) {

[f(malita), 2016/09/17 14:21:22]

nit: can readPixels ever fail for this unit test?  If not, maybe
ASSERT_TRUE(canvas.readPixels(...))?

[reed1, 2016/09/19 00:11:52]

This is a general pixel checker. I'm not sure that all callers ensure that read
should always work.

+    return false;
+  }
 
   // Check corner points first. They should be of canvas_color.
   if (!IsOfColor(bitmap, x, y, canvas_color)) return false;

[f(malita), 2016/09/17 14:21:22]

Previously we were reading the full backing store, but now we're only extracting
[x y w h].  I think the coords below need to be adjusted relative to the new
origin (x,y).  Might be easier to just read the full canvas, like before.

(kinda scary that it passes as-is; looks like there's only one client which uses
smallish insets so that may explain it)

[reed1, 2016/09/19 00:11:52]

Good point about needing the entire canvas read. Will fix.

   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;
   if (!IsOfColor(bitmap, x, (y + h / 2), rect_color)) return false;
   if (!IsOfColor(bitmap, x + w, (y + h / 2), rect_color)) return false;
   if (!IsOfColor(bitmap, (x + w / 2), y + h, rect_color)) return false;
 
@@ skipping 281 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