| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/browser/renderer_host/delegated_frame_host.h" | 5 #include "content/browser/renderer_host/delegated_frame_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 create_resize_lock_after_commit_ = false; | 714 create_resize_lock_after_commit_ = false; |
| 715 MaybeCreateResizeLock(); | 715 MaybeCreateResizeLock(); |
| 716 } | 716 } |
| 717 } | 717 } |
| 718 | 718 |
| 719 void DelegatedFrameHost::OnCompositingStarted(ui::Compositor* compositor, | 719 void DelegatedFrameHost::OnCompositingStarted(ui::Compositor* compositor, |
| 720 base::TimeTicks start_time) { | 720 base::TimeTicks start_time) { |
| 721 last_draw_ended_ = start_time; | 721 last_draw_ended_ = start_time; |
| 722 } | 722 } |
| 723 | 723 |
| 724 void DelegatedFrameHost::OnCompositingEnded(ui::Compositor* compositor) {} |
| 725 |
| 724 void DelegatedFrameHost::OnCompositingLockStateChanged( | 726 void DelegatedFrameHost::OnCompositingLockStateChanged( |
| 725 ui::Compositor* compositor) { | 727 ui::Compositor* compositor) { |
| 726 if (resize_lock_ && resize_lock_->timed_out()) { | 728 if (resize_lock_ && resize_lock_->timed_out()) { |
| 727 // A compositor lock that is part of a resize lock timed out. We allow | 729 // A compositor lock that is part of a resize lock timed out. We allow |
| 728 // the UI to produce a frame before locking it again, so we don't lock here. | 730 // the UI to produce a frame before locking it again, so we don't lock here. |
| 729 // We release the |resize_lock_| though to allow any other resizes that are | 731 // We release the |resize_lock_| though to allow any other resizes that are |
| 730 // desired at the same time since we're allowing the UI to make a frame | 732 // desired at the same time since we're allowing the UI to make a frame |
| 731 // which will gutter anyways. | 733 // which will gutter anyways. |
| 732 resize_lock_.reset(); | 734 resize_lock_.reset(); |
| 733 create_resize_lock_after_commit_ = true; | 735 create_resize_lock_after_commit_ = true; |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 } | 866 } |
| 865 | 867 |
| 866 if (!skipped_frames_) { | 868 if (!skipped_frames_) { |
| 867 latest_confirmed_begin_frame_source_id_ = ack.source_id; | 869 latest_confirmed_begin_frame_source_id_ = ack.source_id; |
| 868 latest_confirmed_begin_frame_sequence_number_ = | 870 latest_confirmed_begin_frame_sequence_number_ = |
| 869 ack.latest_confirmed_sequence_number; | 871 ack.latest_confirmed_sequence_number; |
| 870 } | 872 } |
| 871 } | 873 } |
| 872 | 874 |
| 873 } // namespace content | 875 } // namespace content |
| OLD | NEW |