[blimp] Add SkPicture caching support.

cc/playback/recording_source.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/recording_source.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 10 matching lines @@
 
 #ifdef NDEBUG
 const bool kDefaultClearCanvasSetting = false;
 #else
 const bool kDefaultClearCanvasSetting = true;
 #endif
 
 }  // namespace
 
 namespace cc {
-class ImageSerializationProcessor;
 
 RecordingSource::RecordingSource()
     : slow_down_raster_scale_factor_for_debug_(0),
       generate_discardable_images_metadata_(false),
       requires_clear_(false),
       is_solid_color_(false),
       clear_canvas_with_debug_color_(kDefaultClearCanvasSetting),
       solid_color_(SK_ColorTRANSPARENT),
       background_color_(SK_ColorTRANSPARENT),
       painter_reported_memory_usage_(0) {}
 
 RecordingSource::~RecordingSource() {}
 
-void RecordingSource::ToProtobuf(
-    proto::RecordingSource* proto,
-    ImageSerializationProcessor* image_serialization_processor) const {
+void RecordingSource::ToProtobuf(proto::RecordingSource* proto) const {
   RectToProto(recorded_viewport_, proto->mutable_recorded_viewport());
   SizeToProto(size_, proto->mutable_size());
   proto->set_slow_down_raster_scale_factor_for_debug(
       slow_down_raster_scale_factor_for_debug_);
   proto->set_generate_discardable_images_metadata(
       generate_discardable_images_metadata_);
   proto->set_requires_clear(requires_clear_);
   proto->set_is_solid_color(is_solid_color_);
   proto->set_clear_canvas_with_debug_color(clear_canvas_with_debug_color_);
   proto->set_solid_color(static_cast<uint64_t>(solid_color_));
   proto->set_background_color(static_cast<uint64_t>(background_color_));
-  if (display_list_) {
-    display_list_->ToProtobuf(proto->mutable_display_list(),
-                              image_serialization_processor);
-  }
+  if (display_list_)
+    display_list_->ToProtobuf(proto->mutable_display_list());
 }
 
 void RecordingSource::FromProtobuf(
     const proto::RecordingSource& proto,
-    ImageSerializationProcessor* image_serialization_processor) {
+    ClientPictureCache* client_picture_cache,
+    std::vector<uint32_t>* used_engine_picture_ids) {
+  DCHECK(client_picture_cache);
   recorded_viewport_ = ProtoToRect(proto.recorded_viewport());
   size_ = ProtoToSize(proto.size());
   slow_down_raster_scale_factor_for_debug_ =
       proto.slow_down_raster_scale_factor_for_debug();
   generate_discardable_images_metadata_ =
       proto.generate_discardable_images_metadata();
   requires_clear_ = proto.requires_clear();
   is_solid_color_ = proto.is_solid_color();
   clear_canvas_with_debug_color_ = proto.clear_canvas_with_debug_color();
   solid_color_ = static_cast<SkColor>(proto.solid_color());
   background_color_ = static_cast<SkColor>(proto.background_color());
 
   // This might not exist if the |display_list_| of the serialized
   // RecordingSource was null, wich can happen if |Clear()| is
   // called.
   if (proto.has_display_list()) {
     display_list_ = DisplayItemList::CreateFromProto(
-        proto.display_list(), image_serialization_processor);
+        proto.display_list(), client_picture_cache, used_engine_picture_ids);
     FinishDisplayItemListUpdate();
   } else {
     display_list_ = nullptr;
   }
 }
 
 void RecordingSource::UpdateInvalidationForNewViewport(
     const gfx::Rect& old_recorded_viewport,
     const gfx::Rect& new_recorded_viewport,
     Region* invalidation) {
@@ skipping 111 matching lines @@
 }
 
 bool RecordingSource::IsSuitableForGpuRasterization() const {
   // The display list needs to be created (see: UpdateAndExpandInvalidation)
   // before checking for suitability. There are cases where an update will not
   // create a display list (e.g., if the size is empty). We return true in these
   // cases because the gpu suitability bit sticks false.
   return !display_list_ || display_list_->IsSuitableForGpuRasterization();
 }
 
+scoped_refptr<const DisplayItemList> RecordingSource::GetDisplayItemList() {

[vmpstr, 2016/06/24 18:58:32]

Make this return a raw ptr

[nyquist, 2016/06/24 20:31:23]

Done.

+  return display_list_;
+}
+
 scoped_refptr<RasterSource> RecordingSource::CreateRasterSource(
     bool can_use_lcd_text) const {
   return scoped_refptr<RasterSource>(
       RasterSource::CreateFromRecordingSource(this, can_use_lcd_text));
 }
 
 void RecordingSource::DetermineIfSolidColor() {
   DCHECK(display_list_);
   is_solid_color_ = false;
   solid_color_ = SK_ColorTRANSPARENT;
@@ skipping 10 matching lines @@
 }
 
 void RecordingSource::Clear() {
   recorded_viewport_ = gfx::Rect();
   display_list_ = nullptr;
   painter_reported_memory_usage_ = 0;
   is_solid_color_ = false;
 }
 
 }  // namespace cc