cc: Clean up RecordingSource API

cc/layers/picture_layer_impl_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/layers/picture_layer_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 4291 matching lines @@
 
   ActivateTree();
   EXPECT_FALSE(active_layer()->GetPendingOrActiveTwinLayer());
 
   // Make an empty pending tree.
   host_impl()->CreatePendingTree();
   host_impl()->pending_tree()->DetachLayers();
   EXPECT_FALSE(active_layer()->GetPendingOrActiveTwinLayer());
 }
 
+void GetClientDataAndUpdateInvalidation(RecordingSource* recording_source,
+                                        FakeContentLayerClient* client,
+                                        Region invalidation,
+                                        gfx::Size layer_bounds) {
+  gfx::Rect new_recorded_viewport = client->PaintableRegion();
+  scoped_refptr<DisplayItemList> display_list =
+      client->PaintContentsToDisplayList(
+          ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
+  size_t painter_reported_memory_usage =
+      client->GetApproximateUnsharedMemoryUsage();
+
+  recording_source->UpdateAndExpandInvalidation(
+      client, &invalidation, layer_bounds, new_recorded_viewport, display_list,
+      painter_reported_memory_usage);
+}
+
 void PictureLayerImplTest::TestQuadsForSolidColor(bool test_for_solid) {
   host_impl()->AdvanceToNextFrame(base::TimeDelta::FromMilliseconds(1));
 
   gfx::Size tile_size(100, 100);
   gfx::Size layer_bounds(200, 200);
   gfx::Rect layer_rect(layer_bounds);
 
   FakeContentLayerClient client;
   client.set_bounds(layer_bounds);
   scoped_refptr<PictureLayer> layer = PictureLayer::Create(&client);
   FakeLayerTreeHostClient host_client;
   TestTaskGraphRunner task_graph_runner;
   std::unique_ptr<FakeLayerTreeHost> host =
       FakeLayerTreeHost::Create(&host_client, &task_graph_runner);
   host->SetRootLayer(layer);
   RecordingSource* recording_source = layer->GetRecordingSourceForTesting();
 
-  int frame_number = 0;
-
   client.set_fill_with_nonsolid_color(!test_for_solid);
 
   Region invalidation(layer_rect);
-  recording_source->UpdateAndExpandInvalidation(
-      &client, &invalidation, layer_bounds, frame_number++,
-      RecordingSource::RECORD_NORMALLY);
+
+  GetClientDataAndUpdateInvalidation(recording_source, &client, invalidation,
+                                     layer_bounds);
 
   scoped_refptr<RasterSource> pending_raster_source =
       recording_source->CreateRasterSource(true);
 
   SetupPendingTreeWithFixedTileSize(pending_raster_source, tile_size, Region());
   ActivateTree();
 
   if (test_for_solid) {
     EXPECT_EQ(0u, active_layer()->tilings()->num_tilings());
   } else {
@@ skipping 35 matching lines @@
   FakeContentLayerClient client;
   client.set_bounds(layer_bounds);
   scoped_refptr<PictureLayer> layer = PictureLayer::Create(&client);
   FakeLayerTreeHostClient host_client;
   TestTaskGraphRunner task_graph_runner;
   std::unique_ptr<FakeLayerTreeHost> host =
       FakeLayerTreeHost::Create(&host_client, &task_graph_runner);
   host->SetRootLayer(layer);
   RecordingSource* recording_source = layer->GetRecordingSourceForTesting();
 
-  int frame_number = 0;
-
   client.set_fill_with_nonsolid_color(true);
 
   recording_source->SetNeedsDisplayRect(layer_rect);
   Region invalidation1;
-  recording_source->UpdateAndExpandInvalidation(
-      &client, &invalidation1, layer_bounds, frame_number++,
-      RecordingSource::RECORD_NORMALLY);
+
+  GetClientDataAndUpdateInvalidation(recording_source, &client, invalidation1,
+                                     layer_bounds);
 
   scoped_refptr<RasterSource> raster_source1 =
       recording_source->CreateRasterSource(true);
 
   SetupPendingTree(raster_source1);
   ActivateTree();
   bool update_lcd_text = false;
   host_impl()->active_tree()->UpdateDrawProperties(update_lcd_text);
 
   // We've started with a solid layer that contains some tilings.
   ASSERT_TRUE(active_layer()->tilings());
   EXPECT_NE(0u, active_layer()->tilings()->num_tilings());
 
   client.set_fill_with_nonsolid_color(false);
 
   recording_source->SetNeedsDisplayRect(layer_rect);
   Region invalidation2;
-  recording_source->UpdateAndExpandInvalidation(
-      &client, &invalidation2, layer_bounds, frame_number++,
-      RecordingSource::RECORD_NORMALLY);
+
+  GetClientDataAndUpdateInvalidation(recording_source, &client, invalidation2,
+                                     layer_bounds);
 
   scoped_refptr<RasterSource> raster_source2 =
       recording_source->CreateRasterSource(true);
 
   SetupPendingTree(raster_source2);
   ActivateTree();
 
   // We've switched to a solid color, so we should end up with no tilings.
   ASSERT_TRUE(active_layer()->tilings());
   EXPECT_EQ(0u, active_layer()->tilings()->num_tilings());
@@ skipping 572 matching lines @@
     EXPECT_FLOAT_EQ(expected_contents_scale,
                     pending_layer_ptr->picture_layer_tiling_set()
                         ->FindTilingWithResolution(HIGH_RESOLUTION)
                         ->contents_scale())
         << "ideal_contents_scale: " << ideal_contents_scale;
   }
 }
 
 }  // namespace
 }  // namespace cc