| 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 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 934 LayerIteratorType::Begin(&render_surface_layer_list_); | 934 LayerIteratorType::Begin(&render_surface_layer_list_); |
| 935 it != end; | 935 it != end; |
| 936 ++it) { | 936 ++it) { |
| 937 if (!it.represents_itself()) | 937 if (!it.represents_itself()) |
| 938 continue; | 938 continue; |
| 939 LayerImpl* layer_impl = *it; | 939 LayerImpl* layer_impl = *it; |
| 940 layer_impl->GetAllTilesForTracing(tiles); | 940 layer_impl->GetAllTilesForTracing(tiles); |
| 941 } | 941 } |
| 942 } | 942 } |
| 943 | 943 |
| 944 void LayerTreeImpl::AsValueInto(base::debug::TracedValue* state) const { | 944 void LayerTreeImpl::AsValueInto(base::trace_event::TracedValue* state) const { |
| 945 TracedValue::MakeDictIntoImplicitSnapshot(state, "cc::LayerTreeImpl", this); | 945 TracedValue::MakeDictIntoImplicitSnapshot(state, "cc::LayerTreeImpl", this); |
| 946 state->SetInteger("source_frame_number", source_frame_number_); | 946 state->SetInteger("source_frame_number", source_frame_number_); |
| 947 | 947 |
| 948 state->BeginDictionary("root_layer"); | 948 state->BeginDictionary("root_layer"); |
| 949 root_layer_->AsValueInto(state); | 949 root_layer_->AsValueInto(state); |
| 950 state->EndDictionary(); | 950 state->EndDictionary(); |
| 951 | 951 |
| 952 state->BeginArray("render_surface_layer_list"); | 952 state->BeginArray("render_surface_layer_list"); |
| 953 typedef LayerIterator<LayerImpl> LayerIteratorType; | 953 typedef LayerIterator<LayerImpl> LayerIteratorType; |
| 954 LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_); | 954 LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_); |
| (...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1585 scoped_ptr<PendingPageScaleAnimation> pending_animation) { | 1585 scoped_ptr<PendingPageScaleAnimation> pending_animation) { |
| 1586 pending_page_scale_animation_ = pending_animation.Pass(); | 1586 pending_page_scale_animation_ = pending_animation.Pass(); |
| 1587 } | 1587 } |
| 1588 | 1588 |
| 1589 scoped_ptr<PendingPageScaleAnimation> | 1589 scoped_ptr<PendingPageScaleAnimation> |
| 1590 LayerTreeImpl::TakePendingPageScaleAnimation() { | 1590 LayerTreeImpl::TakePendingPageScaleAnimation() { |
| 1591 return pending_page_scale_animation_.Pass(); | 1591 return pending_page_scale_animation_.Pass(); |
| 1592 } | 1592 } |
| 1593 | 1593 |
| 1594 } // namespace cc | 1594 } // namespace cc |
| OLD | NEW |