Serialize PictureLayer properties.

cc/layers/picture_layer.h

 // Copyright 2012 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.
 
 #ifndef CC_LAYERS_PICTURE_LAYER_H_
 #define CC_LAYERS_PICTURE_LAYER_H_
 
 #include "cc/base/invalidation_region.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/debug/micro_benchmark_controller.h"
 #include "cc/layers/layer.h"
 
 namespace cc {
 
 class ContentLayerClient;
 class DisplayListRecordingSource;
 class ResourceUpdateQueue;
+class TestSerializationPictureLayer;

[vmpstr, 2015/12/16 04:21:08]

Does the friend declaration below act as a forward declare as well? If not, can
you put a blank line between this and the rest of the declares and a comment
about where this is used?

[David Trainor- moved to gerrit, 2015/12/16 19:10:58]

Done.

 
 class CC_EXPORT PictureLayer : public Layer {
  public:
   static scoped_refptr<PictureLayer> Create(const LayerSettings& settings,
                                             ContentLayerClient* client);
 
   void ClearClient();
 
   void SetNearestNeighbor(bool nearest_neighbor);
 
@@ skipping 17 matching lines @@
 
  protected:
   PictureLayer(const LayerSettings& settings, ContentLayerClient* client);
   // Allow tests to inject a recording source.
   PictureLayer(const LayerSettings& settings,
                ContentLayerClient* client,
                scoped_ptr<DisplayListRecordingSource> source);
   ~PictureLayer() override;
 
   bool HasDrawableContent() const override;
+  void LayerSpecificPropertiesToProto(proto::LayerProperties* proto) override;
+  void FromLayerSpecificPropertiesProto(
+      const proto::LayerProperties& proto) override;
 
   bool is_mask() const { return is_mask_; }
 
  private:
+  friend class TestSerializationPictureLayer;
+
+  void ValidateRecordingSource();
+
   ContentLayerClient* client_;
   scoped_ptr<DisplayListRecordingSource> recording_source_;
   devtools_instrumentation::
       ScopedLayerObjectTracker instrumentation_object_tracker_;
 
   // Invalidation to use the next time update is called.
   InvalidationRegion invalidation_;
 
   gfx::Rect last_updated_visible_layer_rect_;
 
   int update_source_frame_number_;
   bool is_mask_;
   bool nearest_neighbor_;
 
   DISALLOW_COPY_AND_ASSIGN(PictureLayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_PICTURE_LAYER_H_