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 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
855 state->BeginArray("render_surface_layer_list"); | 855 state->BeginArray("render_surface_layer_list"); |
856 typedef LayerIterator<LayerImpl> LayerIteratorType; | 856 typedef LayerIterator<LayerImpl> LayerIteratorType; |
857 LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_); | 857 LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list_); |
858 for (LayerIteratorType it = LayerIteratorType::Begin( | 858 for (LayerIteratorType it = LayerIteratorType::Begin( |
859 &render_surface_layer_list_); it != end; ++it) { | 859 &render_surface_layer_list_); it != end; ++it) { |
860 if (!it.represents_itself()) | 860 if (!it.represents_itself()) |
861 continue; | 861 continue; |
862 TracedValue::AppendIDRef(*it, state); | 862 TracedValue::AppendIDRef(*it, state); |
863 } | 863 } |
864 state->EndArray(); | 864 state->EndArray(); |
| 865 |
| 866 state->BeginArray("swap_promise_trace_ids"); |
| 867 for (size_t i = 0; i < swap_promise_list_.size(); i++) |
| 868 state->AppendDouble(swap_promise_list_[i]->TraceId()); |
| 869 state->EndArray(); |
865 } | 870 } |
866 | 871 |
867 void LayerTreeImpl::SetRootLayerScrollOffsetDelegate( | 872 void LayerTreeImpl::SetRootLayerScrollOffsetDelegate( |
868 LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) { | 873 LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) { |
869 if (root_layer_scroll_offset_delegate_ == root_layer_scroll_offset_delegate) | 874 if (root_layer_scroll_offset_delegate_ == root_layer_scroll_offset_delegate) |
870 return; | 875 return; |
871 | 876 |
872 if (!root_layer_scroll_offset_delegate) { | 877 if (!root_layer_scroll_offset_delegate) { |
873 // Make sure we remove the proxies from their layers before | 878 // Make sure we remove the proxies from their layers before |
874 // releasing them. | 879 // releasing them. |
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1438 | 1443 |
1439 void LayerTreeImpl::InputScrollAnimationFinished() { | 1444 void LayerTreeImpl::InputScrollAnimationFinished() { |
1440 layer_tree_host_impl_->ScrollEnd(); | 1445 layer_tree_host_impl_->ScrollEnd(); |
1441 } | 1446 } |
1442 | 1447 |
1443 BlockingTaskRunner* LayerTreeImpl::BlockingMainThreadTaskRunner() const { | 1448 BlockingTaskRunner* LayerTreeImpl::BlockingMainThreadTaskRunner() const { |
1444 return proxy()->blocking_main_thread_task_runner(); | 1449 return proxy()->blocking_main_thread_task_runner(); |
1445 } | 1450 } |
1446 | 1451 |
1447 } // namespace cc | 1452 } // namespace cc |
OLD | NEW |