Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1145)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/layer_impl.cc

Issue 2004973002: Revert of cc : Add IsInIdtoIndexMap to property tres (patchset #4 id:60001 of https://codereview.ch… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/trees/property_tree.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 1d0389f850f799f6740e2a6c96ee3bbdccd3658d..8dd57fd4c47b6d4c4be533194d6244915b68aec5 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -125,7 +125,6 @@ std::unique_ptr<LayerImpl> LayerImpl::RemoveChildForTesting(LayerImpl* child) {
auto it = std::find(children_.begin(), children_.end(), child);
if (it != children_.end())
children_.erase(it);
- layer_tree_impl()->property_trees()->RemoveIdFromIdToIndexMaps(child->id());
return layer_tree_impl_->RemoveLayer(child->id());
}
@@ -625,25 +624,24 @@ int LayerImpl::num_copy_requests_in_target_subtree() {
}
void LayerImpl::UpdatePropertyTreeTransform() {
- PropertyTrees* property_trees = layer_tree_impl()->property_trees();
- if (property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM,
- id())) {
+ if (transform_tree_index_ != -1) {
+ TransformTree& transform_tree =
+ layer_tree_impl()->property_trees()->transform_tree;
+ TransformNode* node = transform_tree.Node(transform_tree_index_);
// A LayerImpl's own current state is insufficient for determining whether
// it owns a TransformNode, since this depends on the state of the
// corresponding Layer at the time of the last commit. For example, a
// transform animation might have been in progress at the time the last
// commit started, but might have finished since then on the compositor
// thread.
- DCHECK_EQ(transform_tree_index(),
- property_trees->transform_id_to_index_map[id()]);
- TransformNode* node =
- property_trees->transform_tree.Node(transform_tree_index());
+ if (node->owner_id != id())
+ return;
if (node->data.local != transform_) {
node->data.local = transform_;
node->data.needs_local_transform_update = true;
node->data.transform_changed = true;
- property_trees->changed = true;
- property_trees->transform_tree.set_needs_update(true);
+ layer_tree_impl()->property_trees()->changed = true;
+ transform_tree.set_needs_update(true);
// TODO(ajuma): The current criteria for creating clip nodes means that
// property trees may need to be rebuilt when the new transform isn't
// axis-aligned wrt the old transform (see Layer::SetTransform). Since
@@ -655,13 +653,10 @@ void LayerImpl::UpdatePropertyTreeTransform() {
}
void LayerImpl::UpdatePropertyTreeTransformIsAnimated(bool is_animated) {
- PropertyTrees* property_trees = layer_tree_impl()->property_trees();
- if (property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM,
- id())) {
- DCHECK_EQ(transform_tree_index(),
- property_trees->transform_id_to_index_map[id()]);
- TransformNode* node =
- property_trees->transform_tree.Node(transform_tree_index());
+ if (transform_tree_index_ != -1) {
+ TransformTree& transform_tree =
+ layer_tree_impl()->property_trees()->transform_tree;
+ TransformNode* node = transform_tree.Node(transform_tree_index_);
// A LayerImpl's own current state is insufficient for determining whether
// it owns a TransformNode, since this depends on the state of the
// corresponding Layer at the time of the last commit. For example, if
@@ -671,6 +666,8 @@ void LayerImpl::UpdatePropertyTreeTransformIsAnimated(bool is_animated) {
// activation (and, in that case, the LayerImpl will no longer own a
// TransformNode, unless it has non-animation-related reasons for owning a
// node).
+ if (node->owner_id != id())
+ return;
if (node->data.has_potential_animation != is_animated) {
node->data.has_potential_animation = is_animated;
if (is_animated) {
@@ -692,27 +689,29 @@ void LayerImpl::UpdatePropertyTreeTransformIsAnimated(bool is_animated) {
node->data.has_only_translation_animations = true;
}
- property_trees->transform_tree.set_needs_update(true);
+ transform_tree.set_needs_update(true);
layer_tree_impl()->set_needs_update_draw_properties();
}
}
}
void LayerImpl::UpdatePropertyTreeOpacity() {
- PropertyTrees* property_trees = layer_tree_impl()->property_trees();
- if (property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id())) {
+ if (effect_tree_index_ != -1) {
+ EffectTree& effect_tree = layer_tree_impl()->property_trees()->effect_tree;
+ if (effect_tree_index_ >= static_cast<int>(effect_tree.size()))
+ return;
+ EffectNode* node = effect_tree.Node(effect_tree_index_);
// A LayerImpl's own current state is insufficient for determining whether
// it owns an OpacityNode, since this depends on the state of the
// corresponding Layer at the time of the last commit. For example, an
// opacity animation might have been in progress at the time the last commit
// started, but might have finished since then on the compositor thread.
- DCHECK_EQ(effect_tree_index(),
- property_trees->effect_id_to_index_map[id()]);
- EffectNode* node = property_trees->effect_tree.Node(effect_tree_index_);
+ if (node->owner_id != id() || node->data.opacity == opacity_)
+ return;
node->data.opacity = opacity_;
node->data.effect_changed = true;
- property_trees->changed = true;
- property_trees->effect_tree.set_needs_update(true);
+ layer_tree_impl()->property_trees()->changed = true;
+ effect_tree.set_needs_update(true);
}
}
@@ -738,8 +737,7 @@ void LayerImpl::OnFilterAnimated(const FilterOperations& filters) {
layer_tree_impl()->set_needs_update_draw_properties();
EffectTree& effect_tree = layer_tree_impl()->property_trees()->effect_tree;
EffectNode* node = effect_tree.Node(effect_tree_index_);
- DCHECK(layer_tree_impl()->property_trees()->IsInIdToIndexMap(
- PropertyTrees::TreeType::EFFECT, id()));
+ DCHECK_EQ(node->owner_id, id());
node->data.effect_changed = true;
layer_tree_impl()->property_trees()->changed = true;
effect_tree.set_needs_update(true);
@@ -780,15 +778,14 @@ void LayerImpl::OnScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset) {
void LayerImpl::OnTransformIsCurrentlyAnimatingChanged(
bool is_currently_animating) {
DCHECK(layer_tree_impl_);
- PropertyTrees* property_trees = layer_tree_impl()->property_trees();
- if (!property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM,
- id()))
+ TransformTree& transform_tree =
+ layer_tree_impl_->property_trees()->transform_tree;
+ TransformNode* node = transform_tree.Node(transform_tree_index());
+ if (!node)
return;
- DCHECK_EQ(transform_tree_index(),
- property_trees->transform_id_to_index_map[id()]);
- TransformNode* node =
- property_trees->transform_tree.Node(transform_tree_index());
- node->data.is_currently_animating = is_currently_animating;
+
+ if (node->owner_id == id())
+ node->data.is_currently_animating = is_currently_animating;
}
void LayerImpl::OnTransformIsPotentiallyAnimatingChanged(
@@ -800,25 +797,22 @@ void LayerImpl::OnTransformIsPotentiallyAnimatingChanged(
void LayerImpl::OnOpacityIsCurrentlyAnimatingChanged(
bool is_currently_animating) {
DCHECK(layer_tree_impl_);
- PropertyTrees* property_trees = layer_tree_impl()->property_trees();
- if (!property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id()))
- return;
- DCHECK_EQ(effect_tree_index(), property_trees->effect_id_to_index_map[id()]);
- EffectNode* node = property_trees->effect_tree.Node(effect_tree_index());
+ EffectTree& effect_tree = layer_tree_impl_->property_trees()->effect_tree;
+ EffectNode* node = effect_tree.Node(effect_tree_index());
- node->data.is_currently_animating_opacity = is_currently_animating;
+ if (node->owner_id == id())
+ node->data.is_currently_animating_opacity = is_currently_animating;
}
void LayerImpl::OnOpacityIsPotentiallyAnimatingChanged(
bool has_potential_animation) {
DCHECK(layer_tree_impl_);
- PropertyTrees* property_trees = layer_tree_impl()->property_trees();
- if (!property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id()))
- return;
- DCHECK_EQ(effect_tree_index(), property_trees->effect_id_to_index_map[id()]);
- EffectNode* node = property_trees->effect_tree.Node(effect_tree_index());
- node->data.has_potential_opacity_animation = has_potential_animation;
- property_trees->effect_tree.set_needs_update(true);
+ EffectTree& effect_tree = layer_tree_impl_->property_trees()->effect_tree;
+ EffectNode* node = effect_tree.Node(effect_tree_index());
+ if (node->owner_id == id()) {
+ node->data.has_potential_opacity_animation = has_potential_animation;
+ effect_tree.set_needs_update(true);
+ }
}
bool LayerImpl::IsActive() const {
@@ -868,8 +862,7 @@ void LayerImpl::SetBoundsDelta(const gfx::Vector2dF& bounds_delta) {
// If layer is clipping, then update the clip node using the new bounds.
ClipNode* clip_node = property_trees->clip_tree.Node(clip_tree_index());
if (clip_node) {
- DCHECK(property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::CLIP,
- id()));
+ DCHECK(id() == clip_node->owner_id);
clip_node->data.clip = gfx::RectF(
gfx::PointF() + offset_to_transform_parent(), gfx::SizeF(bounds()));
property_trees->clip_tree.set_needs_update(true);
@@ -1155,14 +1148,16 @@ gfx::ScrollOffset LayerImpl::CurrentScrollOffset() const {
void LayerImpl::UpdatePropertyTreeScrollOffset() {
// TODO(enne): in the future, scrolling should update the scroll tree
// directly instead of going through layers.
- TransformTree& transform_tree =
- layer_tree_impl()->property_trees()->transform_tree;
- TransformNode* node = transform_tree.Node(transform_tree_index_);
- gfx::ScrollOffset current_offset = CurrentScrollOffset();
- if (node->data.scroll_offset != current_offset) {
- node->data.scroll_offset = current_offset;
- node->data.needs_local_transform_update = true;
- transform_tree.set_needs_update(true);
+ if (transform_tree_index_ != -1) {
+ TransformTree& transform_tree =
+ layer_tree_impl()->property_trees()->transform_tree;
+ TransformNode* node = transform_tree.Node(transform_tree_index_);
+ gfx::ScrollOffset current_offset = CurrentScrollOffset();
+ if (node->data.scroll_offset != current_offset) {
+ node->data.scroll_offset = current_offset;
+ node->data.needs_local_transform_update = true;
+ transform_tree.set_needs_update(true);
+ }
}
}
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/trees/property_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698