Update from https://crrev.com/320343

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 67 matching lines @@
   // Check for equivalence.
   unsigned char two_rect_buffer[4 * 100 * 100] = {0};
   DrawPicture(two_rect_buffer, layer_rect, two_rect_picture);
   unsigned char two_rect_buffer_check[4 * 100 * 100] = {0};
   DrawPicture(two_rect_buffer_check, layer_rect, two_rect_picture_check);
 
   EXPECT_EQ(two_rect_picture->LayerRect(), two_rect_picture_check->LayerRect());
   EXPECT_EQ(0, memcmp(two_rect_buffer, two_rect_buffer_check, 4 * 100 * 100));
 }
 
-TEST(PictureTest, PixelRefIterator) {
-  gfx::Rect layer_rect(2048, 2048);
-
-  gfx::Size tile_grid_size(512, 512);
-
-  FakeContentLayerClient content_layer_client;
-
-  // Discardable pixel refs are found in the following grids:
-  // |---|---|---|---|
-  // |   | x |   | x |
-  // |---|---|---|---|
-  // | x |   | x |   |
-  // |---|---|---|---|
-  // |   | x |   | x |
-  // |---|---|---|---|
-  // | x |   | x |   |
-  // |---|---|---|---|
-  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), "discardable", &discardable_bitmap[y][x]);
-        SkPaint paint;
-        content_layer_client.add_draw_bitmap(
-            discardable_bitmap[y][x],
-            gfx::Point(x * 512 + 6, y * 512 + 6), paint);
-      }
-    }
-  }
-
-  scoped_refptr<Picture> picture =
-      Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
-                      RecordingSource::RECORD_NORMALLY);
-
-  // 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 == 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 == discardable_bitmap[1][2].pixelRef());
-    EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
-    EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
-    EXPECT_TRUE(++iterator);
-    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 == discardable_bitmap[1][2].pixelRef());
-  EXPECT_TRUE(++iterator);
-  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 == discardable_bitmap[2][3].pixelRef());
-  EXPECT_TRUE(++iterator);
-  EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
-  EXPECT_FALSE(++iterator);
-
-  EXPECT_TRUE(copy);
-  EXPECT_TRUE(*copy == discardable_bitmap[2][1].pixelRef());
-  EXPECT_TRUE(++copy);
-  EXPECT_TRUE(*copy == discardable_bitmap[2][3].pixelRef());
-  EXPECT_TRUE(++copy);
-  EXPECT_TRUE(*copy == discardable_bitmap[3][2].pixelRef());
-  EXPECT_FALSE(++copy);
-}
-
-TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
-  gfx::Rect layer_rect(1024, 0, 2048, 2048);
-
-  gfx::Size tile_grid_size(512, 512);
-
-  FakeContentLayerClient content_layer_client;
-
-  // Discardable pixel refs are found in the following grids:
-  // |---|---|---|---|
-  // |   | x |   | x |
-  // |---|---|---|---|
-  // | x |   | x |   |
-  // |---|---|---|---|
-  // |   | x |   | x |
-  // |---|---|---|---|
-  // | x |   | x |   |
-  // |---|---|---|---|
-  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), "discardable", &discardable_bitmap[y][x]);
-        SkPaint paint;
-        content_layer_client.add_draw_bitmap(
-            discardable_bitmap[y][x],
-            gfx::Point(1024 + x * 512 + 6, y * 512 + 6), paint);
-      }
-    }
-  }
-
-  scoped_refptr<Picture> picture =
-      Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
-                      RecordingSource::RECORD_NORMALLY);
-
-  // 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 == 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 == discardable_bitmap[1][2].pixelRef());
-    EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[2][1].pixelRef());
-    EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[2][3].pixelRef());
-    EXPECT_TRUE(++iterator);
-    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 == discardable_bitmap[1][2].pixelRef());
-    EXPECT_TRUE(++iterator);
-    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 == discardable_bitmap[2][3].pixelRef());
-    EXPECT_TRUE(++iterator);
-    EXPECT_TRUE(*iterator == discardable_bitmap[3][2].pixelRef());
-    EXPECT_FALSE(++iterator);
-
-    EXPECT_TRUE(copy);
-    EXPECT_TRUE(*copy == discardable_bitmap[2][1].pixelRef());
-    EXPECT_TRUE(++copy);
-    EXPECT_TRUE(*copy == discardable_bitmap[2][3].pixelRef());
-    EXPECT_TRUE(++copy);
-    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);
-  }
-  {
-    Picture::PixelRefIterator iterator(gfx::Rect(3500, 0, 1000, 1000),
-                                       picture.get());
-    EXPECT_FALSE(iterator);
-  }
-  {
-    Picture::PixelRefIterator iterator(gfx::Rect(0, 1100, 1000, 1000),
-                                       picture.get());
-    EXPECT_FALSE(iterator);
-  }
-  {
-    Picture::PixelRefIterator iterator(gfx::Rect(3500, 1100, 1000, 1000),
-                                       picture.get());
-    EXPECT_FALSE(iterator);
-  }
-}
-
-TEST(PictureTest, PixelRefIteratorOnePixelQuery) {
-  gfx::Rect layer_rect(2048, 2048);
-
-  gfx::Size tile_grid_size(512, 512);
-
-  FakeContentLayerClient content_layer_client;
-
-  // Discardable pixel refs are found in the following grids:
-  // |---|---|---|---|
-  // |   | x |   | x |
-  // |---|---|---|---|
-  // | x |   | x |   |
-  // |---|---|---|---|
-  // |   | x |   | x |
-  // |---|---|---|---|
-  // | x |   | x |   |
-  // |---|---|---|---|
-  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), "discardable", &discardable_bitmap[y][x]);
-        SkPaint paint;
-        content_layer_client.add_draw_bitmap(
-            discardable_bitmap[y][x],
-            gfx::Point(x * 512 + 6, y * 512 + 6), paint);
-      }
-    }
-  }
-
-  scoped_refptr<Picture> picture =
-      Picture::Create(layer_rect, &content_layer_client, tile_grid_size, true,
-                      RecordingSource::RECORD_NORMALLY);
-
-  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 == discardable_bitmap[y][x].pixelRef());
-        EXPECT_FALSE(++iterator) << x << " " << y;
-      } else {
-        EXPECT_FALSE(iterator) << x << " " << y;
-      }
-    }
-  }
-}
-
 TEST(PictureTest, CreateFromSkpValue) {
   SkGraphics::Init();
 
   gfx::Rect layer_rect(100, 200);
 
   gfx::Size tile_grid_size(100, 200);
 
   FakeContentLayerClient content_layer_client;
 
   scoped_ptr<base::Value> tmp;
@@ skipping 72 matching lines @@
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
   EXPECT_EQ(ContentLayerClient::DISPLAY_LIST_CACHING_DISABLED,
             content_layer_client.last_painting_control());
   EXPECT_TRUE(picture.get());
 
   EXPECT_EQ(4, RecordingSource::RECORDING_MODE_COUNT);
 }
 
 }  // namespace
 }  // namespace cc