| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 975 } | 975 } |
| 976 | 976 |
| 977 void LayerTreeImpl::SetNeedsRedraw() { | 977 void LayerTreeImpl::SetNeedsRedraw() { |
| 978 layer_tree_host_impl_->SetNeedsRedraw(); | 978 layer_tree_host_impl_->SetNeedsRedraw(); |
| 979 } | 979 } |
| 980 | 980 |
| 981 AnimationRegistrar* LayerTreeImpl::GetAnimationRegistrar() const { | 981 AnimationRegistrar* LayerTreeImpl::GetAnimationRegistrar() const { |
| 982 return layer_tree_host_impl_->animation_registrar(); | 982 return layer_tree_host_impl_->animation_registrar(); |
| 983 } | 983 } |
| 984 | 984 |
| 985 void LayerTreeImpl::GetAllTilesForTracing(std::set<const Tile*>* tiles) const { | 985 void LayerTreeImpl::GetAllTilesAndPrioritiesForTracing( |
| 986 std::map<const Tile*, TilePriority>* tile_map) const { |
| 986 typedef LayerIterator<LayerImpl> LayerIteratorType; | 987 typedef LayerIterator<LayerImpl> LayerIteratorType; |
| 987 LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_); | 988 LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_); |
| 988 for (LayerIteratorType it = | 989 for (LayerIteratorType it = |
| 989 LayerIteratorType::Begin(&render_surface_layer_list_); | 990 LayerIteratorType::Begin(&render_surface_layer_list_); |
| 990 it != end; | 991 it != end; |
| 991 ++it) { | 992 ++it) { |
| 992 if (!it.represents_itself()) | 993 if (!it.represents_itself()) |
| 993 continue; | 994 continue; |
| 994 LayerImpl* layer_impl = *it; | 995 LayerImpl* layer_impl = *it; |
| 995 layer_impl->GetAllTilesForTracing(tiles); | 996 layer_impl->GetAllTilesAndPrioritiesForTracing(tile_map); |
| 996 } | 997 } |
| 997 } | 998 } |
| 998 | 999 |
| 999 void LayerTreeImpl::AsValueInto(base::trace_event::TracedValue* state) const { | 1000 void LayerTreeImpl::AsValueInto(base::trace_event::TracedValue* state) const { |
| 1000 TracedValue::MakeDictIntoImplicitSnapshot(state, "cc::LayerTreeImpl", this); | 1001 TracedValue::MakeDictIntoImplicitSnapshot(state, "cc::LayerTreeImpl", this); |
| 1001 state->SetInteger("source_frame_number", source_frame_number_); | 1002 state->SetInteger("source_frame_number", source_frame_number_); |
| 1002 | 1003 |
| 1003 state->BeginDictionary("root_layer"); | 1004 state->BeginDictionary("root_layer"); |
| 1004 root_layer_->AsValueInto(state); | 1005 root_layer_->AsValueInto(state); |
| 1005 state->EndDictionary(); | 1006 state->EndDictionary(); |
| (...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1637 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1638 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
| 1638 pending_page_scale_animation_ = pending_animation.Pass(); | 1639 pending_page_scale_animation_ = pending_animation.Pass(); |
| 1639 } | 1640 } |
| 1640 | 1641 |
| 1641 scoped_ptr<PendingPageScaleAnimation> | 1642 scoped_ptr<PendingPageScaleAnimation> |
| 1642 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1643 LayerTreeImpl::TakePendingPageScaleAnimation() { |
| 1643 return pending_page_scale_animation_.Pass(); | 1644 return pending_page_scale_animation_.Pass(); |
| 1644 } | 1645 } |
| 1645 | 1646 |
| 1646 } // namespace cc | 1647 } // namespace cc |
| OLD | NEW |