OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/latency_info_swap_promise_monitor.h" | 5 #include "cc/trees/latency_info_swap_promise_monitor.h" |
6 | 6 |
7 #include "base/threading/platform_thread.h" | 7 #include "base/threading/platform_thread.h" |
8 #include "cc/output/latency_info_swap_promise.h" | 8 #include "cc/output/latency_info_swap_promise.h" |
9 #include "cc/trees/layer_tree_host.h" | 9 #include "cc/trees/layer_tree_host.h" |
10 #include "cc/trees/layer_tree_host_impl.h" | 10 #include "cc/trees/layer_tree_host_impl.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 : SwapPromiseMonitor(layer_tree_host, layer_tree_host_impl), | 45 : SwapPromiseMonitor(layer_tree_host, layer_tree_host_impl), |
46 latency_(latency) { | 46 latency_(latency) { |
47 } | 47 } |
48 | 48 |
49 LatencyInfoSwapPromiseMonitor::~LatencyInfoSwapPromiseMonitor() { | 49 LatencyInfoSwapPromiseMonitor::~LatencyInfoSwapPromiseMonitor() { |
50 } | 50 } |
51 | 51 |
52 void LatencyInfoSwapPromiseMonitor::OnSetNeedsCommitOnMain() { | 52 void LatencyInfoSwapPromiseMonitor::OnSetNeedsCommitOnMain() { |
53 if (AddRenderingScheduledComponent(latency_, true /* on_main */)) { | 53 if (AddRenderingScheduledComponent(latency_, true /* on_main */)) { |
54 scoped_ptr<SwapPromise> swap_promise(new LatencyInfoSwapPromise(*latency_)); | 54 scoped_ptr<SwapPromise> swap_promise(new LatencyInfoSwapPromise(*latency_)); |
55 layer_tree_host_->QueueSwapPromise(swap_promise.Pass()); | 55 layer_tree_host_->QueueSwapPromise(std::move(swap_promise)); |
56 } | 56 } |
57 } | 57 } |
58 | 58 |
59 void LatencyInfoSwapPromiseMonitor::OnSetNeedsRedrawOnImpl() { | 59 void LatencyInfoSwapPromiseMonitor::OnSetNeedsRedrawOnImpl() { |
60 if (AddRenderingScheduledComponent(latency_, false /* on_main */)) { | 60 if (AddRenderingScheduledComponent(latency_, false /* on_main */)) { |
61 scoped_ptr<SwapPromise> swap_promise(new LatencyInfoSwapPromise(*latency_)); | 61 scoped_ptr<SwapPromise> swap_promise(new LatencyInfoSwapPromise(*latency_)); |
62 // Queue a pinned swap promise on the active tree. This will allow | 62 // Queue a pinned swap promise on the active tree. This will allow |
63 // measurement of the time to the next SwapBuffers(). The swap | 63 // measurement of the time to the next SwapBuffers(). The swap |
64 // promise is pinned so that it is not interrupted by new incoming | 64 // promise is pinned so that it is not interrupted by new incoming |
65 // activations (which would otherwise break the swap promise). | 65 // activations (which would otherwise break the swap promise). |
66 layer_tree_host_impl_->active_tree()->QueuePinnedSwapPromise( | 66 layer_tree_host_impl_->active_tree()->QueuePinnedSwapPromise( |
67 swap_promise.Pass()); | 67 std::move(swap_promise)); |
68 } | 68 } |
69 } | 69 } |
70 | 70 |
71 void LatencyInfoSwapPromiseMonitor::OnForwardScrollUpdateToMainThreadOnImpl() { | 71 void LatencyInfoSwapPromiseMonitor::OnForwardScrollUpdateToMainThreadOnImpl() { |
72 if (AddForwardingScrollUpdateToMainComponent(latency_)) { | 72 if (AddForwardingScrollUpdateToMainComponent(latency_)) { |
73 int64 new_sequence_number = 0; | 73 int64 new_sequence_number = 0; |
74 for (ui::LatencyInfo::LatencyMap::const_iterator it = | 74 for (ui::LatencyInfo::LatencyMap::const_iterator it = |
75 latency_->latency_components().begin(); | 75 latency_->latency_components().begin(); |
76 it != latency_->latency_components().end(); ++it) { | 76 it != latency_->latency_components().end(); ++it) { |
77 if (it->first.first == ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT) { | 77 if (it->first.first == ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT) { |
(...skipping 11 matching lines...) Expand all Loading... |
89 ui::LatencyInfo new_latency; | 89 ui::LatencyInfo new_latency; |
90 new_latency.AddLatencyNumberWithTraceName( | 90 new_latency.AddLatencyNumberWithTraceName( |
91 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 0, | 91 ui::LATENCY_BEGIN_SCROLL_LISTENER_UPDATE_MAIN_COMPONENT, 0, |
92 new_sequence_number, "ScrollUpdate"); | 92 new_sequence_number, "ScrollUpdate"); |
93 new_latency.CopyLatencyFrom( | 93 new_latency.CopyLatencyFrom( |
94 *latency_, | 94 *latency_, |
95 ui::INPUT_EVENT_LATENCY_FORWARD_SCROLL_UPDATE_TO_MAIN_COMPONENT); | 95 ui::INPUT_EVENT_LATENCY_FORWARD_SCROLL_UPDATE_TO_MAIN_COMPONENT); |
96 scoped_ptr<SwapPromise> swap_promise( | 96 scoped_ptr<SwapPromise> swap_promise( |
97 new LatencyInfoSwapPromise(new_latency)); | 97 new LatencyInfoSwapPromise(new_latency)); |
98 layer_tree_host_impl_->QueueSwapPromiseForMainThreadScrollUpdate( | 98 layer_tree_host_impl_->QueueSwapPromiseForMainThreadScrollUpdate( |
99 swap_promise.Pass()); | 99 std::move(swap_promise)); |
100 } | 100 } |
101 } | 101 } |
102 | 102 |
103 } // namespace cc | 103 } // namespace cc |
OLD | NEW |