Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / cc / resources / picture_unittest.cc

diff --git a/src/cc/resources/picture_unittest.cc b/src/cc/resources/picture_unittest.cc
index f279a99..b0b6486 100644 (file)
--- a/src/cc/resources/picture_unittest.cc
+++ b/src/cc/resources/picture_unittest.cc
@@ -48,9 +48,8 @@ TEST(PictureTest, AsBase64String) {
 
   // Single full-size rect picture.
   content_layer_client.add_draw_rect(layer_rect, red_paint);
-  scoped_refptr<Picture> one_rect_picture = Picture::Create(layer_rect);
-  one_rect_picture->Record(&content_layer_client,
-                           tile_grid_info);
+  scoped_refptr<Picture> one_rect_picture = Picture::Create(
+      layer_rect, &content_layer_client, tile_grid_info, false, 0);
   scoped_ptr<base::Value> serialized_one_rect(
       one_rect_picture->AsValue());
 
@@ -74,9 +73,8 @@ TEST(PictureTest, AsBase64String) {
 
   // Two rect picture.
   content_layer_client.add_draw_rect(gfx::Rect(25, 25, 50, 50), green_paint);
-  scoped_refptr<Picture> two_rect_picture = Picture::Create(layer_rect);
-  two_rect_picture->Record(&content_layer_client,
-                           tile_grid_info);
+  scoped_refptr<Picture> two_rect_picture = Picture::Create(
+      layer_rect, &content_layer_client, tile_grid_info, false, 0);
 
   scoped_ptr<base::Value> serialized_two_rect(
       two_rect_picture->AsValue());
@@ -110,7 +108,7 @@ TEST(PictureTest, PixelRefIterator) {
 
   FakeContentLayerClient content_layer_client;
 
-  // Lazy pixel refs are found in the following grids:
+  // Discardable pixel refs are found in the following grids:
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
@@ -120,23 +118,22 @@ TEST(PictureTest, PixelRefIterator) {
   // |---|---|---|---|
   // | 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);
+  scoped_refptr<Picture> picture = Picture::Create(
+      layer_rect, &content_layer_client, tile_grid_info, true, 0);
 
   // Default iterator does not have any pixel refs
   {
@@ -149,7 +146,8 @@ TEST(PictureTest, PixelRefIterator) {
                                          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;
@@ -161,13 +159,13 @@ TEST(PictureTest, PixelRefIterator) {
     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);
   }
 
@@ -175,25 +173,25 @@ TEST(PictureTest, PixelRefIterator) {
   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);
 }
 
@@ -207,7 +205,7 @@ TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
 
   FakeContentLayerClient content_layer_client;
 
-  // Lazy pixel refs are found in the following grids:
+  // Discardable pixel refs are found in the following grids:
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
@@ -217,23 +215,22 @@ TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
   // |---|---|---|---|
   // | 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);
+  scoped_refptr<Picture> picture = Picture::Create(
+      layer_rect, &content_layer_client, tile_grid_info, true, 0);
 
   // Default iterator does not have any pixel refs
   {
@@ -246,7 +243,7 @@ TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
           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;
@@ -258,13 +255,13 @@ TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
     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);
   }
 
@@ -273,25 +270,25 @@ TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
     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);
   }
 
@@ -328,7 +325,7 @@ TEST(PictureTest, PixelRefIteratorOnePixelQuery) {
 
   FakeContentLayerClient content_layer_client;
 
-  // Lazy pixel refs are found in the following grids:
+  // Discardable pixel refs are found in the following grids:
   // |---|---|---|---|
   // |   | x |   | x |
   // |---|---|---|---|
@@ -338,23 +335,22 @@ TEST(PictureTest, PixelRefIteratorOnePixelQuery) {
   // |---|---|---|---|
   // | 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);
+  scoped_refptr<Picture> picture = Picture::Create(
+      layer_rect, &content_layer_client, tile_grid_info, true, 0);
 
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
@@ -362,7 +358,7 @@ TEST(PictureTest, PixelRefIteratorOnePixelQuery) {
           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;
@@ -398,9 +394,8 @@ TEST(PictureTest, CreateFromSkpValue) {
 
   // Single full-size rect picture.
   content_layer_client.add_draw_rect(layer_rect, red_paint);
-  scoped_refptr<Picture> one_rect_picture = Picture::Create(layer_rect);
-  one_rect_picture->Record(&content_layer_client,
-                           tile_grid_info);
+  scoped_refptr<Picture> one_rect_picture = Picture::Create(
+      layer_rect, &content_layer_client, tile_grid_info, false, 0);
   scoped_ptr<base::Value> serialized_one_rect(
       one_rect_picture->AsValue());