Index: cc/layers/layer.cc |
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc |
index 88043a749aba0d0a3e1087765892c247209569b8..f46050249d151a76ae486d47127632a935fa26a8 100644 |
--- a/cc/layers/layer.cc |
+++ b/cc/layers/layer.cc |
@@ -76,7 +76,6 @@ Layer::Layer(const LayerSettings& settings) |
is_container_for_fixed_position_layers_(false), |
is_drawable_(false), |
draws_content_(false), |
- hide_layer_and_subtree_(false), |
masks_to_bounds_(false), |
contents_opaque_(false), |
double_sided_(true), |
@@ -98,8 +97,7 @@ Layer::Layer(const LayerSettings& settings) |
replica_layer_(nullptr), |
client_(nullptr), |
num_unclipped_descendants_(0), |
- frame_timing_requests_dirty_(false), |
- is_hidden_from_property_trees_(false) { |
+ frame_timing_requests_dirty_(false) { |
if (!settings.use_compositor_animation_timelines) { |
layer_animation_controller_ = LayerAnimationController::Create(layer_id_); |
layer_animation_controller_->AddValueObserver(this); |
@@ -1106,15 +1104,6 @@ void Layer::SetIsDrawable(bool is_drawable) { |
UpdateDrawsContent(HasDrawableContent()); |
} |
-void Layer::SetHideLayerAndSubtree(bool hide) { |
- DCHECK(IsPropertyChangeAllowed()); |
- if (hide_layer_and_subtree_ == hide) |
- return; |
- |
- hide_layer_and_subtree_ = hide; |
- SetNeedsCommit(); |
-} |
- |
void Layer::SetNeedsDisplayRect(const gfx::Rect& dirty_rect) { |
if (dirty_rect.IsEmpty()) |
return; |
@@ -1198,7 +1187,6 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { |
layer->set_offset_to_transform_parent(offset_to_transform_parent_); |
layer->SetDoubleSided(double_sided_); |
layer->SetDrawsContent(DrawsContent()); |
- layer->SetHideLayerAndSubtree(hide_layer_and_subtree_); |
layer->SetHasRenderSurface(has_render_surface_); |
layer->SetForceRenderSurface(force_render_surface_); |
if (!layer->FilterIsAnimatingOnImplOnly() && !FilterIsAnimating()) |
@@ -1238,7 +1226,6 @@ void Layer::PushPropertiesTo(LayerImpl* layer) { |
layer->set_user_scrollable_vertical(user_scrollable_vertical_); |
layer->SetElementId(element_id_); |
layer->SetMutableProperties(mutable_properties_); |
- layer->set_is_hidden_from_property_trees(is_hidden_from_property_trees_); |
LayerImpl* scroll_parent = nullptr; |
if (scroll_parent_) { |
@@ -1470,7 +1457,6 @@ void Layer::LayerSpecificPropertiesToProto(proto::LayerProperties* proto) { |
base->mutable_offset_to_transform_parent()); |
base->set_double_sided(double_sided_); |
base->set_draws_content(draws_content_); |
- base->set_hide_layer_and_subtree(hide_layer_and_subtree_); |
base->set_has_render_surface(has_render_surface_); |
// TODO(nyquist): Add support for serializing FilterOperations for |
@@ -1560,7 +1546,6 @@ void Layer::FromLayerSpecificPropertiesProto( |
ProtoToVector2dF(base.offset_to_transform_parent()); |
double_sided_ = base.double_sided(); |
draws_content_ = base.draws_content(); |
- hide_layer_and_subtree_ = base.hide_layer_and_subtree(); |
has_render_surface_ = base.has_render_surface(); |
masks_to_bounds_ = base.masks_to_bounds(); |
main_thread_scrolling_reasons_ = |