cc/blimp: Add (de)-serialization for PictureLayer and ScrollbarLayer.

cc/layers/layer.h

 // Copyright 2010 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_LAYER_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 340 matching lines @@
   // since that is an enum (the protobuf library does not generate enum
   // classes), it can't be forward declared. We don't want to include
   // //cc/proto/layer.pb.h in this header file, as it requires that all
   // dependent targets would have to be given the config for how to include it.
   virtual void SetTypeForProtoSerialization(proto::LayerNode* proto) const;
 
   // Recursively iterate over this layer and all children and write the
   // hierarchical structure to the given LayerNode proto. In addition to the
   // structure itself, the Layer id and type is also written to facilitate
   // construction of the correct layer on the client.
-  void ToLayerNodeProto(proto::LayerNode* proto) const;
+  virtual void ToLayerNodeProto(proto::LayerNode* proto) const;
 
   // Recursively iterate over this layer and all children and reset the
   // properties sent with the hierarchical structure in the LayerNode protos.
   // This must be done before deserializing the new LayerTree from the Layernode
   // protos.
   void ClearLayerTreePropertiesForDeserializationAndAddToMap(
       LayerIdMap* layer_map);
 
   // Recursively iterate over the given LayerNode proto and read the structure
   // into this node and its children. The |layer_map| should be used to look
   // for previously existing Layers, since they should be re-used between each
   // hierarchy update.
-  void FromLayerNodeProto(const proto::LayerNode& proto,
-                          const LayerIdMap& layer_map,
-                          LayerTreeHost* layer_tree_host);
+  virtual void FromLayerNodeProto(const proto::LayerNode& proto,
+                                  const LayerIdMap& layer_map,
+                                  LayerTreeHost* layer_tree_host);
 
   // This method is similar to PushPropertiesTo, but instead of pushing to
   // a LayerImpl, it pushes the properties to proto::LayerProperties. It is
   // called only on layers that have changed properties. The properties
   // themselves are pushed to proto::LayerProperties.
   void ToLayerPropertiesProto(proto::LayerUpdate* layer_update,
                               bool inputs_only);
 
   // Read all property values from the given LayerProperties object and update
   // the current layer. The values for |needs_push_properties_| and
@@ skipping 102 matching lines @@
   ElementListType GetElementTypeForAnimation() const;
 
  protected:
   friend class LayerImpl;
   friend class TreeSynchronizer;
   virtual ~Layer();
   Layer();
 
   // Tests in remote mode need to explicitly set the layer id so it matches the
   // layer id for the corresponding Layer on the engine.
   explicit Layer(int layer_id);

[vmpstr, 2016/10/07 23:50:05]

I'd rather this be something like layer->SetLayerForTesting()

[Khushal, 2016/10/08 00:41:32]

That's actually much better and simplifies things a bunch. Thanks! Done.

 
   LayerTreeHost* layer_tree_host() { return layer_tree_host_; }
   const LayerTreeHost* layer_tree_host() const { return layer_tree_host_; }
 
   // These SetNeeds functions are in order of severity of update:
   //
   // Called when this layer has been modified in some way, but isn't sure
   // that it needs a commit yet.  It needs CalcDrawProperties and UpdateLayers
   // before it knows whether or not a commit is required.
   void SetNeedsUpdate();
@@ skipping 214 matching lines @@
   // These all act like draw properties, so don't need push properties.
   gfx::Rect visible_layer_rect_;
   size_t num_unclipped_descendants_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_