[blimp] Add SkPicture caching support.

cc/playback/display_item_list_unittest.cc

 // Copyright 2014 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/display_item_list.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/clip_path_display_item.h"
 #include "cc/playback/compositing_display_item.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/playback/filter_display_item.h"
 #include "cc/playback/float_clip_display_item.h"
 #include "cc/playback/transform_display_item.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/test/fake_image_serialization_processor.h"
+#include "cc/test/fake_picture_cache.h"
 #include "cc/test/skia_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
 #include "third_party/skia/include/effects/SkImageSource.h"
@@ skipping 42 matching lines @@
       kVisualRect, recorder.finishRecordingAsPicture());
 }
 
 void ValidateDisplayItemListSerialization(const gfx::Size& layer_size,
                                           scoped_refptr<DisplayItemList> list) {
   list->Finalize();
 
   std::unique_ptr<FakeImageSerializationProcessor>
       fake_image_serialization_processor =
           base::WrapUnique(new FakeImageSerializationProcessor);
+  std::unique_ptr<EnginePictureCache> fake_engine_picture_cache =
+      fake_image_serialization_processor->CreateEnginePictureCache();
+  std::unique_ptr<ClientPictureCache> fake_client_picture_cache =
+      fake_image_serialization_processor->CreateClientPictureCache();
 
   // Serialize and deserialize the DisplayItemList.
   proto::DisplayItemList proto;
-  list->ToProtobuf(&proto, fake_image_serialization_processor.get());
-  scoped_refptr<DisplayItemList> new_list = DisplayItemList::CreateFromProto(
-      proto, fake_image_serialization_processor.get());
+  list->ToProtobuf(&proto);
+
+  // Marking the list for registration ends up adding all the SkPictures to the
+  // cache.
+  list->MarkForRegistrationEngine(fake_engine_picture_cache.get());
+
+  scoped_refptr<DisplayItemList> new_list =
+      DisplayItemList::CreateFromProto(proto, fake_client_picture_cache.get());
 
   EXPECT_TRUE(
       AreDisplayListDrawingResultsSame(gfx::Rect(layer_size), list, new_list));
 }
 
 }  // namespace
 
 TEST(DisplayItemListTest, SerializeDisplayItemListSettings) {
   DisplayItemListSettings settings;
   settings.use_cached_picture = false;
@@ skipping 525 matching lines @@
 
   value = list->AsValue(false)->ToString();
   EXPECT_EQ(value.find("\"items\":"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[0,0,0,0]"), std::string::npos);
   // There should be no skp64 entry present as the items aren't included and the
   // layer rect is empty.
   EXPECT_EQ(value.find("\"skp64\":"), std::string::npos);
 }
 
 }  // namespace cc