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 a7cde02..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());
@@ -134,10 +132,8 @@ TEST(PictureTest, PixelRefIterator) {
     }
   }
 
-  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
   {
@@ -233,10 +229,8 @@ TEST(PictureTest, PixelRefIteratorNonZeroLayer) {
     }
   }
 
-  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
   {
@@ -355,10 +349,8 @@ TEST(PictureTest, PixelRefIteratorOnePixelQuery) {
     }
   }
 
-  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) {
@@ -402,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());