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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 2269143003: cc : Add OnTransformAnimated to transform tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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/trees/layer_tree_impl.h ('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/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index ad25a4cd0c589daed7d6065dff13570f1e9c4861..d9a81764ec7002401e3e11b604ffae104cef5bfc 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -508,14 +508,18 @@ LayerImplList::reverse_iterator LayerTreeImpl::rend() {
return layer_list_.rend();
}
-LayerImpl* LayerTreeImpl::LayerByElementId(ElementId element_id) const {
+int LayerTreeImpl::LayerIdByElementId(ElementId element_id) const {
auto iter = element_layers_map_.find(element_id);
if (iter == element_layers_map_.end())
- return nullptr;
+ return Layer::INVALID_ID;
return iter->second;
}
+LayerImpl* LayerTreeImpl::LayerByElementId(ElementId element_id) const {
+ return LayerById(LayerIdByElementId(element_id));
+}
+
void LayerTreeImpl::AddToElementMap(LayerImpl* layer) {
if (!layer->element_id())
return;
@@ -525,7 +529,7 @@ void LayerTreeImpl::AddToElementMap(LayerImpl* layer) {
layer->element_id().AsValue().release(), "layer_id",
layer->id());
- element_layers_map_[layer->element_id()] = layer;
+ element_layers_map_[layer->element_id()] = layer->id();
layer_tree_host_impl_->animation_host()->RegisterElement(
layer->element_id(),
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | cc/trees/property_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698