Serialize PictureLayer properties.

cc/proto/layer.proto

 // Copyright 2015 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.
 
 syntax = "proto2";
 
+import "display_list_recording_source.proto";
 import "layer_position_constraint.proto";
 import "point3f.proto";
 import "pointf.proto";
 import "region.proto";
 import "rect.proto";
 import "scroll_offset.proto";
 import "size.proto";
 import "skxfermode.proto";
 import "transform.proto";
 import "vector2df.proto";
 
 package cc.proto;
 
 option optimize_for = LITE_RUNTIME;
 
 // Identifies the type of cc:Layer a LayerNode represents. It is used to
 // facilitate reconstruction of a Layer of the correct type on the client.
 enum LayerType {
-  Base = 1;
+  UNKNOWN = 0;
+  LAYER = 1;
+  PICTURE_LAYER = 2;
 
   // TODO(nyquist): Add the rest of the necessary LayerTypes.
 };
 
 // Hierarchical structure for serializing the Layer tree.
 message LayerNode {
   // required
   optional int32 id = 1;
   // required
   optional LayerType type = 2;
@@ skipping 15 matching lines @@
   optional int32 id = 1;
   // required
   optional bool needs_push_properties = 3;
   // required
   optional int32 num_dependents_need_push_properties = 4;
 
   // The properties below are only read if |needs_push_properties| is set.
   // The Layer base class and each descendant have different proto messages
   // for their specific properties.
   optional BaseLayerProperties base = 5;
+
+  // Only one of these fields may be set per LayerProperties.
+  // TODO(dtrainor): use a 'oneof' union when it's supported in Chromium.  See
+  // crbug.com/570371.
+  optional PictureLayerProperties picture = 6;
 }
 
 message BaseLayerProperties {
   optional Point3F transform_origin = 1;
   optional uint32 background_color = 2;
   optional Size bounds = 3;
   optional int64 transform_free_index = 4;
   optional int64 effect_tree_index = 5;
   optional int64 clip_tree_index = 6;
   optional Vector2dF offset_to_transform_parent = 7;
@@ skipping 43 matching lines @@
 
   optional Rect update_rect = 46;
   optional bool stacking_order_changed = 47;
 
   // TODO(nyquist): Figure out what to do with LayerAnimationController.
   // optional LayerAnimationController layer_animation_controller = 48;
 
   // TODO(nyquist): Figure out what to do with FrameTimingRequests.
   // repeated FrameTimingRequest frame_timing_requests = 49;
 }
+
+message PictureLayerProperties {
+  optional DisplayListRecordingSource recording_source = 1;
+  optional Region invalidation = 2;
+  optional Rect last_updated_visible_layer_rect = 3;
+  optional bool is_mask = 4;
+  optional bool nearest_neighbor = 5;
+
+  optional int64 update_source_frame_number = 6;
+}