cc: Use sublayer scale from effect tree (2)

cc/proto/property_tree.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 "element_id.proto";
 import "rectf.proto";
 import "scroll_offset.proto";
 import "size.proto";
@@ skipping 22 matching lines @@
   optional bool is_invertible = 13;
   optional bool ancestors_are_invertible = 14;
   optional bool has_potential_animation = 15;
   optional bool is_currently_animating = 42;
   optional bool to_screen_is_potentially_animated = 16;
   optional bool has_only_translation_animations = 17;
   optional bool flattens_inherited_transform = 19;
   optional bool node_and_ancestors_are_flat = 20;
   optional bool node_and_ancestors_have_only_integer_translation = 21;
   optional bool scrolls = 22;
-  optional bool needs_sublayer_scale = 23;
+  optional bool needs_surface_contents_scale = 23;
   optional bool affected_by_inner_viewport_bounds_delta_x = 24;
   optional bool affected_by_inner_viewport_bounds_delta_y = 25;
   optional bool affected_by_outer_viewport_bounds_delta_x = 26;
   optional bool affected_by_outer_viewport_bounds_delta_y = 27;
   optional bool in_subtree_of_page_scale_layer = 28;
   optional bool transform_changed = 40;
   optional float post_local_scale_factor = 29;
 
-  optional Vector2dF sublayer_scale = 34;
+  optional Vector2dF surface_contents_scale = 34;
   optional ScrollOffset scroll_offset = 35;
   optional Vector2dF scroll_snap = 36;
   optional Vector2dF source_offset = 37;
   optional Vector2dF source_to_parent = 38;
   optional int64 sorting_context_id = 39;
 }
 
 // Proto for TransformCachedNodeData
 message TransformCachedNodeData {
   optional Transform from_target = 1;
@@ skipping 36 matching lines @@
   optional bool has_potential_opacity_animation = 7;
   optional bool is_currently_animating_opacity = 16;
   optional bool effect_changed = 11;
   optional int64 num_copy_requests_in_subtree = 8;
   optional int64 transform_id = 9;
   optional int64 clip_id = 10;
   optional int64 target_id = 12;
   optional int64 mask_layer_id = 17;
   optional int64 replica_layer_id = 18;
   optional int64 replica_mask_layer_id = 19;
-  optional Vector2dF sublayer_scale = 20;
+  optional Vector2dF surface_contents_scale = 20;
 }
 
 // Proto for struct ScrollNodeData
 // NEXT ID: 16
 message ScrollNodeData {
   optional bool scrollable = 1;
   optional int32 main_thread_scrolling_reasons = 2;
   optional bool contains_non_fast_scrollable_region = 3;
   optional Size scroll_clip_layer_bounds = 4;
   optional Size bounds = 5;
@@ skipping 92 matching lines @@
   optional bool full_tree_damaged = 12;
   optional int64 sequence_number = 6;
   optional bool is_main_thread = 13;
   optional bool is_active = 14;
 
   optional Vector2dF inner_viewport_container_bounds_delta = 8;
   optional Vector2dF outer_viewport_container_bounds_delta = 9;
   optional Vector2dF inner_viewport_scroll_bounds_delta = 10;
   repeated int64 always_use_active_tree_opacity_effect_ids = 15 [packed = true];
 }