cc: Clean up RecordingSource API

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_item.proto";
 import "layer_position_constraint.proto";
 import "point3f.proto";
 import "pointf.proto";
-import "recording_source.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;
 
@@ skipping 102 matching lines @@
 
   optional ScrollOffset scroll_offset = 44;
 
   optional Rect update_rect = 46;
 
   // TODO(nyquist): Figure out what to do with LayerAnimationController.
   // optional LayerAnimationController layer_animation_controller = ???;
 }
 
 message PictureLayerProperties {
-  optional RecordingSource 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 Region invalidation = 1;
+  optional Rect last_updated_visible_layer_rect = 2;
+  optional bool is_mask = 3;
+  optional bool nearest_neighbor = 4;
 
-  optional int64 update_source_frame_number = 6;
+  optional int64 update_source_frame_number = 5;
+
+  optional Rect recorded_viewport = 6;
+  optional Size size = 7;
+  optional int64 slow_down_raster_scale_factor_for_debug = 8;
+  optional bool generate_discardable_images_metadata = 9;
+  optional bool requires_clear = 10;
+  optional bool is_solid_color = 11;
+  optional bool clear_canvas_with_debug_color = 12;
+  optional uint64 solid_color = 13;
+  optional uint64 background_color = 14;
+  optional DisplayItemList display_list = 15;
 }
 
 message SolidColorScrollbarLayerProperties {
   enum ScrollbarOrientation {
     HORIZONTAL = 0;
     VERTICAL = 1;
   };
 
   optional int32 scroll_layer_id = 1;
   optional int32 thumb_thickness = 2;
   optional int32 track_start = 3;
   optional bool is_left_side_vertical_scrollbar = 4;
   optional ScrollbarOrientation orientation = 5;
 }