cc: Add best_record_time to rendering stats.

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 15 matching lines @@
   SkGraphics::Init();
 
   gfx::Rect layer_rect(100, 100);
 
   SkTileGridPicture::TileGridInfo tile_grid_info;
   tile_grid_info.fTileInterval = SkISize::Make(100, 100);
   tile_grid_info.fMargin.setEmpty();
   tile_grid_info.fOffset.setZero();
 
   FakeContentLayerClient content_layer_client;
-  FakeRenderingStatsInstrumentation stats_instrumentation;
 
   scoped_ptr<base::Value> tmp;
 
   SkPaint red_paint;
   red_paint.setColor(SkColorSetARGB(255, 255, 0, 0));
   SkPaint green_paint;
   green_paint.setColor(SkColorSetARGB(255, 0, 255, 0));
 
   // Invalid picture (not a dict).
   tmp.reset(new base::StringValue("abc!@#$%"));
   scoped_refptr<Picture> invalid_picture =
       Picture::CreateFromValue(tmp.get());
   EXPECT_TRUE(!invalid_picture.get());
 
   // 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,
-                           &stats_instrumentation);
+                           tile_grid_info);
   scoped_ptr<base::Value> serialized_one_rect(
       one_rect_picture->AsValue());
 
   // Reconstruct the picture.
   scoped_refptr<Picture> one_rect_picture_check =
       Picture::CreateFromValue(serialized_one_rect.get());
   EXPECT_TRUE(!!one_rect_picture_check.get());
 
   // Check for equivalence.
   unsigned char one_rect_buffer[4 * 100 * 100] = {0};
   DrawPicture(one_rect_buffer, layer_rect, one_rect_picture);
   unsigned char one_rect_buffer_check[4 * 100 * 100] = {0};
   DrawPicture(one_rect_buffer_check, layer_rect, one_rect_picture_check);
 
   EXPECT_EQ(one_rect_picture->LayerRect(),
             one_rect_picture_check->LayerRect());
   EXPECT_EQ(one_rect_picture->OpaqueRect(),
             one_rect_picture_check->OpaqueRect());
   EXPECT_TRUE(
       memcmp(one_rect_buffer, one_rect_buffer_check, 4 * 100 * 100) == 0);
 
   // 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,
-                           &stats_instrumentation);
+                           tile_grid_info);
 
   scoped_ptr<base::Value> serialized_two_rect(
       two_rect_picture->AsValue());
 
   // Reconstruct the picture.
   scoped_refptr<Picture> two_rect_picture_check =
       Picture::CreateFromValue(serialized_two_rect.get());
   EXPECT_TRUE(!!two_rect_picture_check.get());
 
   // Check for equivalence.
@@ skipping 38 matching lines @@
         CreateBitmap(gfx::Size(500, 500), "lazy", &lazy_bitmap[y][x]);
         content_layer_client.add_draw_bitmap(
             lazy_bitmap[y][x],
             gfx::Point(x * 512 + 6, y * 512 + 6));
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect);
   picture->Record(&content_layer_client,
-                  tile_grid_info,
-                  &stats_instrumentation);
+                  tile_grid_info);
   picture->GatherPixelRefs(tile_grid_info, &stats_instrumentation);
 
   // 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),
@@ skipping 76 matching lines @@
         CreateBitmap(gfx::Size(500, 500), "lazy", &lazy_bitmap[y][x]);
         content_layer_client.add_draw_bitmap(
             lazy_bitmap[y][x],
             gfx::Point(1024 + x * 512 + 6, y * 512 + 6));
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect);
   picture->Record(&content_layer_client,
-                  tile_grid_info,
-                  &stats_instrumentation);
+                  tile_grid_info);
   picture->GatherPixelRefs(tile_grid_info, &stats_instrumentation);
 
   // 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(
@@ skipping 100 matching lines @@
         CreateBitmap(gfx::Size(500, 500), "lazy", &lazy_bitmap[y][x]);
         content_layer_client.add_draw_bitmap(
             lazy_bitmap[y][x],
             gfx::Point(x * 512 + 6, y * 512 + 6));
       }
     }
   }
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect);
   picture->Record(&content_layer_client,
-                  tile_grid_info,
-                  &stats_instrumentation);
+                  tile_grid_info);
   picture->GatherPixelRefs(tile_grid_info, &stats_instrumentation);
 
   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_FALSE(++iterator) << x << " " << y;
       } else {
         EXPECT_FALSE(iterator) << x << " " << y;
       }
     }
   }
 }
 
 TEST(PictureTest, CreateFromSkpValue) {
   SkGraphics::Init();
 
   gfx::Rect layer_rect(100, 200);
 
   SkTileGridPicture::TileGridInfo tile_grid_info;
   tile_grid_info.fTileInterval = SkISize::Make(100, 200);
   tile_grid_info.fMargin.setEmpty();
   tile_grid_info.fOffset.setZero();
 
   FakeContentLayerClient content_layer_client;
-  FakeRenderingStatsInstrumentation stats_instrumentation;
 
   scoped_ptr<base::Value> tmp;
 
   SkPaint red_paint;
   red_paint.setColor(SkColorSetARGB(255, 255, 0, 0));
   SkPaint green_paint;
   green_paint.setColor(SkColorSetARGB(255, 0, 255, 0));
 
   // Invalid picture (not a dict).
   tmp.reset(new base::StringValue("abc!@#$%"));
   scoped_refptr<Picture> invalid_picture =
       Picture::CreateFromSkpValue(tmp.get());
   EXPECT_TRUE(!invalid_picture.get());
 
   // 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,
-                           &stats_instrumentation);
+                           tile_grid_info);
   scoped_ptr<base::Value> serialized_one_rect(
       one_rect_picture->AsValue());
 
   const base::DictionaryValue* value = NULL;
   EXPECT_TRUE(serialized_one_rect->GetAsDictionary(&value));
 
   // Decode the picture from base64.
   const base::Value* skp_value;
   EXPECT_TRUE(value->Get("skp64", &skp_value));
 
   // Reconstruct the picture.
   scoped_refptr<Picture> one_rect_picture_check =
       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