| 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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 // if necessary. | 709 // if necessary. |
| 710 MaybeCreateResizeLock(); | 710 MaybeCreateResizeLock(); |
| 711 } | 711 } |
| 712 } | 712 } |
| 713 | 713 |
| 714 void DelegatedFrameHost::OnCompositingStarted(ui::Compositor* compositor, | 714 void DelegatedFrameHost::OnCompositingStarted(ui::Compositor* compositor, |
| 715 base::TimeTicks start_time) { | 715 base::TimeTicks start_time) { |
| 716 last_draw_ended_ = start_time; | 716 last_draw_ended_ = start_time; |
| 717 } | 717 } |
| 718 | 718 |
| 719 void DelegatedFrameHost::OnCompositingEnded(ui::Compositor* compositor) {} | |
| 720 | |
| 721 void DelegatedFrameHost::OnCompositingLockStateChanged( | 719 void DelegatedFrameHost::OnCompositingLockStateChanged( |
| 722 ui::Compositor* compositor) { | 720 ui::Compositor* compositor) { |
| 723 // A compositor lock that is part of a resize lock timed out. We | 721 // A compositor lock that is part of a resize lock timed out. We |
| 724 // should display a renderer frame. | 722 // should display a renderer frame. |
| 725 if (!compositor->IsLocked() && can_lock_compositor_ == YES_DID_LOCK) { | 723 if (!compositor->IsLocked() && can_lock_compositor_ == YES_DID_LOCK) { |
| 726 can_lock_compositor_ = NO_PENDING_RENDERER_FRAME; | 724 can_lock_compositor_ = NO_PENDING_RENDERER_FRAME; |
| 727 } | 725 } |
| 728 } | 726 } |
| 729 | 727 |
| 730 void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) { | 728 void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) { |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 869 | 867 |
| 870 void DelegatedFrameHost::ResetCompositorFrameSinkSupport() { | 868 void DelegatedFrameHost::ResetCompositorFrameSinkSupport() { |
| 871 if (!support_) | 869 if (!support_) |
| 872 return; | 870 return; |
| 873 if (compositor_) | 871 if (compositor_) |
| 874 compositor_->RemoveFrameSink(frame_sink_id_); | 872 compositor_->RemoveFrameSink(frame_sink_id_); |
| 875 support_.reset(); | 873 support_.reset(); |
| 876 } | 874 } |
| 877 | 875 |
| 878 } // namespace content | 876 } // namespace content |
| OLD | NEW |