cc: Clean up RecordingSource API

cc/playback/discardable_image_map_unittest.cc

 // Copyright 2015 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/playback/discardable_image_map.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 68 matching lines @@
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
         SkPaint paint;
         content_layer_client.add_draw_image(
             discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6),
             paint);
       }
     }
   }
 
-  FakeRecordingSource recording_source;
-  Region invalidation(visible_rect);
-  recording_source.SetGenerateDiscardableImagesMetadata(true);
-  recording_source.UpdateAndExpandInvalidation(
-      &content_layer_client, &invalidation, visible_rect.size(), 1,
-      RecordingSource::RECORD_NORMALLY);
-  DisplayItemList* display_list = recording_source.display_list();
+  scoped_refptr<DisplayItemList> display_list =
+      content_layer_client.PaintContentsToDisplayList(
+          ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
 
   DiscardableImageMap image_map;
   {
     DiscardableImageMap::ScopedMetadataGenerator generator(&image_map,
                                                            visible_rect.size());
     display_list->Raster(generator.canvas(), nullptr, gfx::Rect(), 1.f);
   }
 
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
@@ skipping 50 matching lines @@
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
         SkPaint paint;
         content_layer_client.add_draw_image(
             discardable_image[y][x],
             gfx::Point(1024 + x * 512 + 6, y * 512 + 6), paint);
       }
     }
   }
 
-  FakeRecordingSource recording_source;
-  Region invalidation(visible_rect);
-  recording_source.SetGenerateDiscardableImagesMetadata(true);
-  recording_source.UpdateAndExpandInvalidation(
-      &content_layer_client, &invalidation, layer_size, 1,
-      RecordingSource::RECORD_NORMALLY);
-  DisplayItemList* display_list = recording_source.display_list();
+  scoped_refptr<DisplayItemList> display_list =
+      content_layer_client.PaintContentsToDisplayList(
+          ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
 
   DiscardableImageMap image_map;
   {
     DiscardableImageMap::ScopedMetadataGenerator generator(&image_map,
                                                            layer_size);
     display_list->Raster(generator.canvas(), nullptr, gfx::Rect(), 1.f);
   }
 
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
@@ skipping 73 matching lines @@
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
         SkPaint paint;
         content_layer_client.add_draw_image(
             discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6),
             paint);
       }
     }
   }
 
-  FakeRecordingSource recording_source;
-  Region invalidation(visible_rect);
-  recording_source.SetGenerateDiscardableImagesMetadata(true);
-  recording_source.UpdateAndExpandInvalidation(
-      &content_layer_client, &invalidation, visible_rect.size(), 1,
-      RecordingSource::RECORD_NORMALLY);
-  DisplayItemList* display_list = recording_source.display_list();
+  scoped_refptr<DisplayItemList> display_list =
+      content_layer_client.PaintContentsToDisplayList(
+          ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
 
   DiscardableImageMap image_map;
   {
     DiscardableImageMap::ScopedMetadataGenerator generator(&image_map,
                                                            visible_rect.size());
     display_list->Raster(generator.canvas(), nullptr, gfx::Rect(), 1.f);
   }
 
   for (int y = 0; y < 4; ++y) {
     for (int x = 0; x < 4; ++x) {
@@ skipping 16 matching lines @@
   gfx::Rect visible_rect(2048, 2048);
   FakeContentLayerClient content_layer_client;
   content_layer_client.set_bounds(visible_rect.size());
 
   sk_sp<SkImage> discardable_image =
       CreateDiscardableImage(gfx::Size(1 << 25, 1 << 25));
   SkPaint paint;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0),
                                       paint);
 
-  FakeRecordingSource recording_source;
-  Region invalidation(visible_rect);
-  recording_source.SetGenerateDiscardableImagesMetadata(true);
-  recording_source.UpdateAndExpandInvalidation(
-      &content_layer_client, &invalidation, visible_rect.size(), 1,
-      RecordingSource::RECORD_NORMALLY);
-  DisplayItemList* display_list = recording_source.display_list();
+  scoped_refptr<DisplayItemList> display_list =
+      content_layer_client.PaintContentsToDisplayList(
+          ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
 
   DiscardableImageMap image_map;
   {
     DiscardableImageMap::ScopedMetadataGenerator generator(&image_map,
                                                            visible_rect.size());
     display_list->Raster(generator.canvas(), nullptr, gfx::Rect(), 1.f);
   }
   std::vector<PositionDrawImage> images =
       GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1));
   EXPECT_EQ(1u, images.size());
@@ skipping 21 matching lines @@
     generator.canvas()->restore();
   }
 
   std::vector<PositionDrawImage> images =
       GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1));
   EXPECT_EQ(1u, images.size());
   EXPECT_TRUE(images[0].image == discardable_image);
 }
 
 }  // namespace cc