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/thread_proxy.h" | 5 #include "cc/trees/thread_proxy.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1161 DCHECK(swap_requested); | 1161 DCHECK(swap_requested); |
1162 result.did_swap = layer_tree_host_impl_->SwapBuffers(frame); | 1162 result.did_swap = layer_tree_host_impl_->SwapBuffers(frame); |
1163 | 1163 |
1164 // We don't know if we have incomplete tiles if we didn't actually swap. | 1164 // We don't know if we have incomplete tiles if we didn't actually swap. |
1165 if (result.did_swap) { | 1165 if (result.did_swap) { |
1166 DCHECK(!frame.has_no_damage); | 1166 DCHECK(!frame.has_no_damage); |
1167 SetSwapUsedIncompleteTileOnImplThread(frame.contains_incomplete_tile); | 1167 SetSwapUsedIncompleteTileOnImplThread(frame.contains_incomplete_tile); |
1168 } | 1168 } |
1169 } | 1169 } |
1170 | 1170 |
| 1171 frame.render_passes.clear(); |
| 1172 |
1171 // Tell the main thread that the the newly-commited frame was drawn. | 1173 // Tell the main thread that the the newly-commited frame was drawn. |
1172 if (next_frame_is_newly_committed_frame_on_impl_thread_) { | 1174 if (next_frame_is_newly_committed_frame_on_impl_thread_) { |
1173 next_frame_is_newly_committed_frame_on_impl_thread_ = false; | 1175 next_frame_is_newly_committed_frame_on_impl_thread_ = false; |
1174 Proxy::MainThreadTaskRunner()->PostTask( | 1176 Proxy::MainThreadTaskRunner()->PostTask( |
1175 FROM_HERE, | 1177 FROM_HERE, |
1176 base::Bind(&ThreadProxy::DidCommitAndDrawFrame, main_thread_weak_ptr_)); | 1178 base::Bind(&ThreadProxy::DidCommitAndDrawFrame, main_thread_weak_ptr_)); |
1177 } | 1179 } |
1178 | 1180 |
1179 if (draw_frame) { | 1181 if (draw_frame) { |
1180 CheckOutputSurfaceStatusOnImplThread(); | 1182 CheckOutputSurfaceStatusOnImplThread(); |
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1642 commit_to_activate_duration_history_.InsertSample( | 1644 commit_to_activate_duration_history_.InsertSample( |
1643 base::TimeTicks::HighResNow() - commit_complete_time_); | 1645 base::TimeTicks::HighResNow() - commit_complete_time_); |
1644 } | 1646 } |
1645 | 1647 |
1646 void ThreadProxy::DidManageTiles() { | 1648 void ThreadProxy::DidManageTiles() { |
1647 DCHECK(IsImplThread()); | 1649 DCHECK(IsImplThread()); |
1648 scheduler_on_impl_thread_->DidManageTiles(); | 1650 scheduler_on_impl_thread_->DidManageTiles(); |
1649 } | 1651 } |
1650 | 1652 |
1651 } // namespace cc | 1653 } // namespace cc |
OLD | NEW |