[blimp] Add SkPicture caching support.

cc/layers/picture_layer_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.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 42 matching lines @@
   void set_update_source_frame_number(int number) {
     update_source_frame_number_ = number;
   }
 
   void set_is_mask(bool is_mask) { is_mask_ = is_mask; }
 
   void set_nearest_neighbor(bool nearest_neighbor) {
     nearest_neighbor_ = nearest_neighbor;
   }
 
-  void ValidateSerialization() {
-    proto::LayerProperties proto;
-    LayerSpecificPropertiesToProto(&proto);
-
+  void ValidateSerialization(
+      ImageSerializationProcessor* image_serialization_processor) {
     FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
     TestTaskGraphRunner task_graph_runner;
     LayerTreeSettings settings;
-    std::unique_ptr<FakeImageSerializationProcessor>
-        fake_image_serialization_processor =
-            base::WrapUnique(new FakeImageSerializationProcessor);
-    std::unique_ptr<FakeLayerTreeHost> host =
-        FakeLayerTreeHost::Create(&host_client, &task_graph_runner, settings,
-                                  CompositorMode::SINGLE_THREADED,
-                                  fake_image_serialization_processor.get());
+    std::unique_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(
+        &host_client, &task_graph_runner, settings,
+        CompositorMode::SINGLE_THREADED, image_serialization_processor);
+    host->InitializePictureCacheForTesting();
     scoped_refptr<TestSerializationPictureLayer> layer =
         TestSerializationPictureLayer::Create(recording_source_viewport_);
     host->SetRootLayer(layer);
+
+    recording_source()->SetEnginePictureCache(host->engine_picture_cache());
+
+    proto::LayerProperties proto;
+    LayerSpecificPropertiesToProto(&proto);
+    // The EnginePictureCache will be invalid after this method ends, so ensure
+    // the recording source does not use it when the layer under test is
+    // destructed.
+    recording_source()->SetEnginePictureCache(nullptr);
+
+    // The client must have the ClientPictureCache available during
+    // deserialization.
+    layer->recording_source()->SetClientPictureCache(
+        host->client_picture_cache());
+
     layer->FromLayerSpecificPropertiesProto(proto);
 
     // Validate that the PictureLayer specific fields are properly set.
     EXPECT_TRUE(recording_source()->EqualsTo(*layer->recording_source()));
     EXPECT_EQ(update_source_frame_number_, layer->update_source_frame_number_);
     EXPECT_EQ(is_mask_, layer->is_mask_);
     EXPECT_EQ(nearest_neighbor_, layer->nearest_neighbor_);
   }
 
  private:
@@ skipping 15 matching lines @@
   FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
   TestTaskGraphRunner task_graph_runner;
   LayerTreeSettings settings;
   std::unique_ptr<FakeImageSerializationProcessor>
       fake_image_serialization_processor =
           base::WrapUnique(new FakeImageSerializationProcessor);
   std::unique_ptr<FakeLayerTreeHost> host =
       FakeLayerTreeHost::Create(&host_client, &task_graph_runner, settings,
                                 CompositorMode::SINGLE_THREADED,
                                 fake_image_serialization_processor.get());
+  host->InitializePictureCacheForTesting();
 
   gfx::Size recording_source_viewport(256, 256);
   scoped_refptr<TestSerializationPictureLayer> layer =
       TestSerializationPictureLayer::Create(recording_source_viewport);
   host->SetRootLayer(layer);
 
   Region region(gfx::Rect(14, 15, 16, 17));
   layer->set_invalidation(region);
   layer->set_is_mask(true);
   layer->set_nearest_neighbor(true);
 
   layer->SetBounds(recording_source_viewport);
   layer->set_update_source_frame_number(0);
   layer->recording_source()->SetDisplayListUsesCachedPicture(false);
   layer->recording_source()->add_draw_rect(
       gfx::Rect(recording_source_viewport));
   layer->recording_source()->SetGenerateDiscardableImagesMetadata(true);
   layer->recording_source()->Rerecord();
-  layer->ValidateSerialization();
+  layer->ValidateSerialization(fake_image_serialization_processor.get());
 }
 
 TEST(PictureLayerTest, TestSerializationDeserialization) {
   FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
   TestTaskGraphRunner task_graph_runner;
   std::unique_ptr<FakeImageSerializationProcessor>
       fake_image_serialization_processor =
           base::WrapUnique(new FakeImageSerializationProcessor);
   std::unique_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(
       &host_client, &task_graph_runner, LayerTreeSettings(),
       CompositorMode::SINGLE_THREADED,
       fake_image_serialization_processor.get());
+  host->InitializePictureCacheForTesting();
+
   gfx::Size recording_source_viewport(256, 256);
   scoped_refptr<TestSerializationPictureLayer> layer =
       TestSerializationPictureLayer::Create(recording_source_viewport);
   host->SetRootLayer(layer);
 
   layer->SetBounds(recording_source_viewport);
   layer->set_update_source_frame_number(0);
   layer->recording_source()->SetDisplayListUsesCachedPicture(false);
   layer->recording_source()->add_draw_rect(
       gfx::Rect(recording_source_viewport));
   layer->recording_source()->SetGenerateDiscardableImagesMetadata(true);
   layer->recording_source()->Rerecord();
-  layer->ValidateSerialization();
+  layer->ValidateSerialization(fake_image_serialization_processor.get());
 }
 
 TEST(PictureLayerTest, TestEmptySerializationDeserialization) {
+  std::unique_ptr<FakeImageSerializationProcessor>
+      fake_image_serialization_processor =
+          base::WrapUnique(new FakeImageSerializationProcessor);
   FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
   TestTaskGraphRunner task_graph_runner;
-  std::unique_ptr<FakeLayerTreeHost> host =
-      FakeLayerTreeHost::Create(&host_client, &task_graph_runner);
+  std::unique_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(
+      &host_client, &task_graph_runner, LayerTreeSettings(),
+      CompositorMode::SINGLE_THREADED,
+      fake_image_serialization_processor.get());
 
   gfx::Size recording_source_viewport(256, 256);
   scoped_refptr<TestSerializationPictureLayer> layer =
       TestSerializationPictureLayer::Create(recording_source_viewport);
   host->SetRootLayer(layer);
-  layer->ValidateSerialization();
+  layer->ValidateSerialization(fake_image_serialization_processor.get());
 }
 
 TEST(PictureLayerTest, NoTilesIfEmptyBounds) {
   ContentLayerClient* client = EmptyContentLayerClient::GetInstance();
   scoped_refptr<PictureLayer> layer = PictureLayer::Create(client);
   layer->SetBounds(gfx::Size(10, 10));
 
   FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
   TestTaskGraphRunner task_graph_runner;
   std::unique_ptr<FakeLayerTreeHost> host =
@@ skipping 285 matching lines @@
   // Do a main frame, record the picture layers. The frame number has changed
   // non-monotonically.
   layer->SetNeedsDisplay();
   host2->Composite(base::TimeTicks::Now());
   EXPECT_EQ(3, layer->update_count());
   EXPECT_EQ(1, host2->source_frame_number());
 }
 
 }  // namespace
 }  // namespace cc