Chromium Code Reviews| 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 { |
|
ajuma
2016/08/23 23:40:12
Just to make sure, this will go away once all the
jaydasika
2016/08/24 00:13:42
Done.
|
| + 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(), |