[blimp] Add SkPicture caching support.

cc/playback/recording_source.h

Index: cc/playback/recording_source.h
diff --git a/cc/playback/recording_source.h b/cc/playback/recording_source.h
index 9e5aa7e95ae50e1ce5ece56f6700b6e7b0c9f0ae..b8cb6d95619ed65d9cda238f62876c3c4155dc7b 100644
--- a/cc/playback/recording_source.h
+++ b/cc/playback/recording_source.h
@@ -23,10 +23,11 @@ namespace proto {
 class RecordingSource;
 }  // namespace proto
 
+class ClientPictureCache;
 class ContentLayerClient;
 class DisplayItemList;
+class EnginePictureCache;
 class RasterSource;
-class ImageSerializationProcessor;
 class Region;
 
 class CC_EXPORT RecordingSource {
@@ -46,11 +47,13 @@ class CC_EXPORT RecordingSource {
   RecordingSource();
   virtual ~RecordingSource();
 
-  void ToProtobuf(
-      proto::RecordingSource* proto,
-      ImageSerializationProcessor* image_serialization_processor) const;
-  void FromProtobuf(const proto::RecordingSource& proto,
-                    ImageSerializationProcessor* image_serialization_processor);
+  void ToProtobuf(proto::RecordingSource* proto) const;
+  void FromProtobuf(const proto::RecordingSource& proto);
+
+  // Updates the EnginePictureCache or ClientPictureCache about the SkPictures
+  // currently in use.
+  void MarkForRegistration();

[vmpstr, 2016/06/01 00:10:57]

I think these should be private

[nyquist, 2016/06/04 00:24:58]

Done.

+  void MarkForUnregistration();
 
   bool UpdateAndExpandInvalidation(ContentLayerClient* painter,
                                    Region* invalidation,
@@ -66,6 +69,14 @@ class CC_EXPORT RecordingSource {
 
   void SetNeedsDisplayRect(const gfx::Rect& layer_rect);
 
+  void set_engine_picture_cache(EnginePictureCache* engine_picture_cache) {

[vmpstr, 2016/06/01 00:10:57]

These setters can do more than just set a pointer (see my comments in
picture_layer). If you agree, please rename them to something like
SetEnginePictureCache

[nyquist, 2016/06/04 00:24:58]

Done.

+    engine_picture_cache_ = engine_picture_cache;
+  }
+
+  void set_client_picture_cache(ClientPictureCache* client_picture_cache) {
+    client_picture_cache_ = client_picture_cache;
+  }
+
   // These functions are virtual for testing.
   virtual scoped_refptr<RasterSource> CreateRasterSource(
       bool can_use_lcd_text) const;
@@ -86,6 +97,9 @@ class CC_EXPORT RecordingSource {
   SkColor solid_color_;
   SkColor background_color_;
 
+  EnginePictureCache* engine_picture_cache_;

[vmpstr, 2016/06/01 00:10:57]

I think this at least needs a comment explaining why there's both egine and
client picture cache and it's uses. 

[nyquist, 2016/06/04 00:24:58]

Done.

+  ClientPictureCache* client_picture_cache_;
+
   scoped_refptr<DisplayItemList> display_list_;
   size_t painter_reported_memory_usage_;