| 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 <limits> | 7 #include <limits> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 839 state->BeginArray("render_surface_layer_list"); | 839 state->BeginArray("render_surface_layer_list"); |
| 840 typedef LayerIterator<LayerImpl> LayerIteratorType; | 840 typedef LayerIterator<LayerImpl> LayerIteratorType; |
| 841 LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_); | 841 LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_); |
| 842 for (LayerIteratorType it = LayerIteratorType::Begin( | 842 for (LayerIteratorType it = LayerIteratorType::Begin( |
| 843 &render_surface_layer_list_); it != end; ++it) { | 843 &render_surface_layer_list_); it != end; ++it) { |
| 844 if (!it.represents_itself()) | 844 if (!it.represents_itself()) |
| 845 continue; | 845 continue; |
| 846 TracedValue::AppendIDRef(*it, state); | 846 TracedValue::AppendIDRef(*it, state); |
| 847 } | 847 } |
| 848 state->EndArray(); | 848 state->EndArray(); |
| 849 |
| 850 state->BeginArray("swap_promise_trace_ids"); |
| 851 for (size_t i = 0; i < swap_promise_list_.size(); i++) |
| 852 state->AppendDouble(swap_promise_list_[i]->TraceId()); |
| 853 state->EndArray(); |
| 849 } | 854 } |
| 850 | 855 |
| 851 void LayerTreeImpl::SetRootLayerScrollOffsetDelegate( | 856 void LayerTreeImpl::SetRootLayerScrollOffsetDelegate( |
| 852 LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) { | 857 LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) { |
| 853 if (root_layer_scroll_offset_delegate_ == root_layer_scroll_offset_delegate) | 858 if (root_layer_scroll_offset_delegate_ == root_layer_scroll_offset_delegate) |
| 854 return; | 859 return; |
| 855 | 860 |
| 856 if (!root_layer_scroll_offset_delegate) { | 861 if (!root_layer_scroll_offset_delegate) { |
| 857 // Make sure we remove the proxies from their layers before | 862 // Make sure we remove the proxies from their layers before |
| 858 // releasing them. | 863 // releasing them. |
| (...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1422 | 1427 |
| 1423 void LayerTreeImpl::InputScrollAnimationFinished() { | 1428 void LayerTreeImpl::InputScrollAnimationFinished() { |
| 1424 layer_tree_host_impl_->ScrollEnd(); | 1429 layer_tree_host_impl_->ScrollEnd(); |
| 1425 } | 1430 } |
| 1426 | 1431 |
| 1427 BlockingTaskRunner* LayerTreeImpl::BlockingMainThreadTaskRunner() const { | 1432 BlockingTaskRunner* LayerTreeImpl::BlockingMainThreadTaskRunner() const { |
| 1428 return proxy()->blocking_main_thread_task_runner(); | 1433 return proxy()->blocking_main_thread_task_runner(); |
| 1429 } | 1434 } |
| 1430 | 1435 |
| 1431 } // namespace cc | 1436 } // namespace cc |
| OLD | NEW |