OLD | NEW |
---|---|
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/trees/layer_tree_impl.h" | 5 #include "cc/trees/layer_tree_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
501 } | 501 } |
502 | 502 |
503 LayerImplList::reverse_iterator LayerTreeImpl::rbegin() { | 503 LayerImplList::reverse_iterator LayerTreeImpl::rbegin() { |
504 return layer_list_.rbegin(); | 504 return layer_list_.rbegin(); |
505 } | 505 } |
506 | 506 |
507 LayerImplList::reverse_iterator LayerTreeImpl::rend() { | 507 LayerImplList::reverse_iterator LayerTreeImpl::rend() { |
508 return layer_list_.rend(); | 508 return layer_list_.rend(); |
509 } | 509 } |
510 | 510 |
511 LayerImpl* LayerTreeImpl::LayerByElementId(ElementId element_id) const { | 511 int LayerTreeImpl::LayerIdByElementId(ElementId element_id) const { |
512 auto iter = element_layers_map_.find(element_id); | 512 auto iter = element_layers_map_.find(element_id); |
513 if (iter == element_layers_map_.end()) | 513 if (iter == element_layers_map_.end()) |
514 return nullptr; | 514 return Layer::INVALID_ID; |
515 | 515 |
516 return iter->second; | 516 return iter->second; |
517 } | 517 } |
518 | 518 |
519 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.
| |
520 return LayerById(LayerIdByElementId(element_id)); | |
521 } | |
522 | |
519 void LayerTreeImpl::AddToElementMap(LayerImpl* layer) { | 523 void LayerTreeImpl::AddToElementMap(LayerImpl* layer) { |
520 if (!layer->element_id()) | 524 if (!layer->element_id()) |
521 return; | 525 return; |
522 | 526 |
523 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), | 527 TRACE_EVENT2(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), |
524 "LayerTreeImpl::AddToElementMap", "element", | 528 "LayerTreeImpl::AddToElementMap", "element", |
525 layer->element_id().AsValue().release(), "layer_id", | 529 layer->element_id().AsValue().release(), "layer_id", |
526 layer->id()); | 530 layer->id()); |
527 | 531 |
528 element_layers_map_[layer->element_id()] = layer; | 532 element_layers_map_[layer->element_id()] = layer->id(); |
529 | 533 |
530 layer_tree_host_impl_->animation_host()->RegisterElement( | 534 layer_tree_host_impl_->animation_host()->RegisterElement( |
531 layer->element_id(), | 535 layer->element_id(), |
532 IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING); | 536 IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING); |
533 } | 537 } |
534 | 538 |
535 void LayerTreeImpl::RemoveFromElementMap(LayerImpl* layer) { | 539 void LayerTreeImpl::RemoveFromElementMap(LayerImpl* layer) { |
536 if (!layer->element_id()) | 540 if (!layer->element_id()) |
537 return; | 541 return; |
538 | 542 |
(...skipping 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2077 | 2081 |
2078 void LayerTreeImpl::ResetAllChangeTracking() { | 2082 void LayerTreeImpl::ResetAllChangeTracking() { |
2079 layers_that_should_push_properties_.clear(); | 2083 layers_that_should_push_properties_.clear(); |
2080 // Iterate over all layers, including masks and replicas. | 2084 // Iterate over all layers, including masks and replicas. |
2081 for (auto& layer : *layers_) | 2085 for (auto& layer : *layers_) |
2082 layer->ResetChangeTracking(); | 2086 layer->ResetChangeTracking(); |
2083 property_trees_.ResetAllChangeTracking(); | 2087 property_trees_.ResetAllChangeTracking(); |
2084 } | 2088 } |
2085 | 2089 |
2086 } // namespace cc | 2090 } // namespace cc |
OLD | NEW |