cc: Gather and lock/unlock SkDiscardablePixelRefs instead of skia::LazyPixelRefs.

cc/resources/picture_unittest.cc

 // Copyright 2013 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.
 
 #include "cc/resources/picture.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/test/fake_content_layer_client.h"
@@ skipping 92 matching lines @@
 TEST(PictureTest, PixelRefIterator) {
   gfx::Rect layer_rect(2048, 2048);
 
   SkTileGridPicture::TileGridInfo tile_grid_info;
   tile_grid_info.fTileInterval = SkISize::Make(512, 512);
   tile_grid_info.fMargin.setEmpty();
   tile_grid_info.fOffset.setZero();
 
   FakeContentLayerClient content_layer_client;
 
-  // Lazy pixel refs are found in the following grids:
+  // Discardable pixel refs are found in the following grids:
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
-  SkBitmap lazy_bitmap[4][4];
+  SkBitmap discardable_bitmap[4][4];
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
-        CreateBitmap(gfx::Size(500, 500), "lazy", &lazy_bitmap[y][x]);
+        CreateBitmap(
+            gfx::Size(500, 500), "discardable", &discardable_bitmap[y][x]);
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
-            lazy_bitmap[y][x],
+            discardable_bitmap[y][x],
             gfx::Point(x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect);
   picture->Record(&content_layer_client,
                   tile_grid_info);
   picture->GatherPixelRefs(tile_grid_info);
 
   // Default iterator does not have any pixel refs
   {
     Picture::PixelRefIterator iterator;
     EXPECT_FALSE(iterator);
   }
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       Picture::PixelRefIterator iterator(gfx::Rect(x * 512, y * 512, 500, 500),
                                          picture.get());
       if ((x + y) & 1) {
         EXPECT_TRUE(iterator) << x << " " << y;
-        EXPECT_TRUE(*iterator == lazy_bitmap[y][x].pixelRef()) << x << " " << y;
+        EXPECT_TRUE(*iterator == discardable_bitmap[y][x].pixelRef()) << x <<
+            " " << y;
         EXPECT_FALSE(++iterator) << x << " " << y;
       } else {
         EXPECT_FALSE(iterator) << x << " " << y;
       }
     }
   }
   // Capture 4 pixel refs.
   {
     Picture::PixelRefIterator iterator(gfx::Rect(512, 512, 2048, 2048),
                                        picture.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[1][2].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][2].pixelRef());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[2][1].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[2][3].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[3][2].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
     EXPECT_FALSE(++iterator);
   }
 
   // Copy test.
   Picture::PixelRefIterator iterator(gfx::Rect(512, 512, 2048, 2048),
                                      picture.get());
   EXPECT_TRUE(iterator);
-  EXPECT_TRUE(*iterator == lazy_bitmap[1][2].pixelRef());
+  EXPECT_TRUE(*iterator == discardable_bitmap[1][2].pixelRef());
   EXPECT_TRUE(++iterator);
-  EXPECT_TRUE(*iterator == lazy_bitmap[2][1].pixelRef());
+  EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
 
   // copy now points to the same spot as iterator,
   // but both can be incremented independently.
   Picture::PixelRefIterator copy = iterator;
   EXPECT_TRUE(++iterator);
-  EXPECT_TRUE(*iterator == lazy_bitmap[2][3].pixelRef());
+  EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
   EXPECT_TRUE(++iterator);
-  EXPECT_TRUE(*iterator == lazy_bitmap[3][2].pixelRef());
+  EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
   EXPECT_FALSE(++iterator);
 
   EXPECT_TRUE(copy);
-  EXPECT_TRUE(*copy == lazy_bitmap[2][1].pixelRef());
+  EXPECT_TRUE(*copy == discardable_bitmap[2][1].pixelRef());
   EXPECT_TRUE(++copy);
-  EXPECT_TRUE(*copy == lazy_bitmap[2][3].pixelRef());
+  EXPECT_TRUE(*copy == discardable_bitmap[2][3].pixelRef());
   EXPECT_TRUE(++copy);
-  EXPECT_TRUE(*copy == lazy_bitmap[3][2].pixelRef());
+  EXPECT_TRUE(*copy == discardable_bitmap[3][2].pixelRef());
   EXPECT_FALSE(++copy);
 }
 
 TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
   gfx::Rect layer_rect(1024, 0, 2048, 2048);
 
   SkTileGridPicture::TileGridInfo tile_grid_info;
   tile_grid_info.fTileInterval = SkISize::Make(512, 512);
   tile_grid_info.fMargin.setEmpty();
   tile_grid_info.fOffset.setZero();
 
   FakeContentLayerClient content_layer_client;
 
-  // Lazy pixel refs are found in the following grids:
+  // Discardable pixel refs are found in the following grids:
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
-  SkBitmap lazy_bitmap[4][4];
+  SkBitmap discardable_bitmap[4][4];
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
-        CreateBitmap(gfx::Size(500, 500), "lazy", &lazy_bitmap[y][x]);
+        CreateBitmap(
+            gfx::Size(500, 500), "discardable", &discardable_bitmap[y][x]);
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
-            lazy_bitmap[y][x],
+            discardable_bitmap[y][x],
             gfx::Point(1024 + x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect);
   picture->Record(&content_layer_client,
                   tile_grid_info);
   picture->GatherPixelRefs(tile_grid_info);
 
   // Default iterator does not have any pixel refs
   {
     Picture::PixelRefIterator iterator;
     EXPECT_FALSE(iterator);
   }
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       Picture::PixelRefIterator iterator(
           gfx::Rect(1024 + x * 512, y * 512, 500, 500), picture.get());
       if ((x + y) & 1) {
         EXPECT_TRUE(iterator) << x << " " << y;
-        EXPECT_TRUE(*iterator == lazy_bitmap[y][x].pixelRef());
+        EXPECT_TRUE(*iterator == discardable_bitmap[y][x].pixelRef());
         EXPECT_FALSE(++iterator) << x << " " << y;
       } else {
         EXPECT_FALSE(iterator) << x << " " << y;
       }
     }
   }
   // Capture 4 pixel refs.
   {
     Picture::PixelRefIterator iterator(gfx::Rect(1024 + 512, 512, 2048, 2048),
                                        picture.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[1][2].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][2].pixelRef());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[2][1].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[2][3].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[3][2].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
     EXPECT_FALSE(++iterator);
   }
 
   // Copy test.
   {
     Picture::PixelRefIterator iterator(gfx::Rect(1024 + 512, 512, 2048, 2048),
                                        picture.get());
     EXPECT_TRUE(iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[1][2].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[1][2].pixelRef());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[2][1].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
 
     // copy now points to the same spot as iterator,
     // but both can be incremented independently.
     Picture::PixelRefIterator copy = iterator;
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[2][3].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
     EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == lazy_bitmap[3][2].pixelRef());
+    EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
     EXPECT_FALSE(++iterator);
 
     EXPECT_TRUE(copy);
-    EXPECT_TRUE(*copy == lazy_bitmap[2][1].pixelRef());
+    EXPECT_TRUE(*copy == discardable_bitmap[2][1].pixelRef());
     EXPECT_TRUE(++copy);
-    EXPECT_TRUE(*copy == lazy_bitmap[2][3].pixelRef());
+    EXPECT_TRUE(*copy == discardable_bitmap[2][3].pixelRef());
     EXPECT_TRUE(++copy);
-    EXPECT_TRUE(*copy == lazy_bitmap[3][2].pixelRef());
+    EXPECT_TRUE(*copy == discardable_bitmap[3][2].pixelRef());
     EXPECT_FALSE(++copy);
   }
 
   // Non intersecting rects
   {
     Picture::PixelRefIterator iterator(gfx::Rect(0, 0, 1000, 1000),
                                        picture.get());
     EXPECT_FALSE(iterator);
   }
   {
@@ skipping 16 matching lines @@
 TEST(PictureTest, PixelRefIteratorOnePixelQuery) {
   gfx::Rect layer_rect(2048, 2048);
 
   SkTileGridPicture::TileGridInfo tile_grid_info;
   tile_grid_info.fTileInterval = SkISize::Make(512, 512);
   tile_grid_info.fMargin.setEmpty();
   tile_grid_info.fOffset.setZero();
 
   FakeContentLayerClient content_layer_client;
 
-  // Lazy pixel refs are found in the following grids:
+  // Discardable pixel refs are found in the following grids:
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
   // | x |   | x |   |
   // |---|---|---|---|
-  SkBitmap lazy_bitmap[4][4];
+  SkBitmap discardable_bitmap[4][4];
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
-        CreateBitmap(gfx::Size(500, 500), "lazy", &lazy_bitmap[y][x]);
+        CreateBitmap(
+            gfx::Size(500, 500), "discardable", &discardable_bitmap[y][x]);
         SkPaint paint;
         content_layer_client.add_draw_bitmap(
-            lazy_bitmap[y][x],
+            discardable_bitmap[y][x],
             gfx::Point(x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect);
   picture->Record(&content_layer_client,
                   tile_grid_info);
   picture->GatherPixelRefs(tile_grid_info);
 
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
       Picture::PixelRefIterator iterator(
           gfx::Rect(x * 512, y * 512 + 256, 1, 1), picture.get());
       if ((x + y) & 1) {
         EXPECT_TRUE(iterator) << x << " " << y;
-        EXPECT_TRUE(*iterator == lazy_bitmap[y][x].pixelRef());
+        EXPECT_TRUE(*iterator == discardable_bitmap[y][x].pixelRef());
         EXPECT_FALSE(++iterator) << x << " " << y;
       } else {
         EXPECT_FALSE(iterator) << x << " " << y;
       }
     }
   }
 }
 
 TEST(PictureTest, CreateFromSkpValue) {
   SkGraphics::Init();
@@ skipping 40 matching lines @@
       Picture::CreateFromSkpValue(skp_value);
   EXPECT_TRUE(!!one_rect_picture_check.get());
 
   EXPECT_EQ(100, one_rect_picture_check->LayerRect().width());
   EXPECT_EQ(200, one_rect_picture_check->LayerRect().height());
   EXPECT_EQ(100, one_rect_picture_check->OpaqueRect().width());
   EXPECT_EQ(200, one_rect_picture_check->OpaqueRect().height());
 }
 }  // namespace
 }  // namespace cc