Revert of Compute if a layer is drawn without LayerTree hierarchy

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 "rectf.proto";
 import "scroll_offset.proto";
 import "transform.proto";
 import "vector2df.proto";
@@ skipping 63 matching lines @@
   optional bool layers_are_clipped = 9;
   optional bool layers_are_clipped_when_surfaces_disabled = 10;
   optional bool resets_clip = 11;
 }
 
 // Proto for struct EffectNodeData.
 message EffectNodeData {
   optional float opacity = 1;
   optional float screen_space_opacity = 2;
   optional bool has_render_surface = 3;
-  optional bool has_copy_request = 4;
-  optional bool has_background_filters = 5;
-  optional bool is_drawn = 6;
-  optional bool screen_space_opacity_is_animating = 7;
-  optional int64 num_copy_requests_in_subtree = 8;
-  optional int64 transform_id = 9;
-  optional int64 clip_id = 10;
+  optional int64 num_copy_requests_in_subtree = 4;
+  optional int64 transform_id = 5;
+  optional int64 clip_id = 6;
 }
 
 message ScrollNodeData {
   optional bool scrollable = 1;
   optional bool should_scroll_on_main_thread = 2;
   optional int32 scroll_blocks_on = 3;
   optional bool contains_non_fast_scrollable_region = 4;
   optional int64 transform_id = 5;
 }
 
@@ skipping 54 matching lines @@
 message PropertyTrees {
   optional PropertyTree transform_tree = 1;
   optional PropertyTree effect_tree = 2;
   optional PropertyTree clip_tree = 3;
   optional PropertyTree scroll_tree = 4;
 
   optional bool needs_rebuild = 5;
   optional bool non_root_surfaces_enabled = 6;
   optional int64 sequence_number = 7;
 }