| 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 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 787 } | 787 } |
| 788 } | 788 } |
| 789 | 789 |
| 790 void DelegatedFrameHost::OnCompositingStarted(ui::Compositor* compositor, | 790 void DelegatedFrameHost::OnCompositingStarted(ui::Compositor* compositor, |
| 791 base::TimeTicks start_time) { | 791 base::TimeTicks start_time) { |
| 792 last_draw_ended_ = start_time; | 792 last_draw_ended_ = start_time; |
| 793 } | 793 } |
| 794 | 794 |
| 795 void DelegatedFrameHost::OnCompositingEnded(ui::Compositor* compositor) {} | 795 void DelegatedFrameHost::OnCompositingEnded(ui::Compositor* compositor) {} |
| 796 | 796 |
| 797 void DelegatedFrameHost::OnCompositingAborted(ui::Compositor* compositor) {} | |
| 798 | |
| 799 void DelegatedFrameHost::OnCompositingLockStateChanged( | 797 void DelegatedFrameHost::OnCompositingLockStateChanged( |
| 800 ui::Compositor* compositor) { | 798 ui::Compositor* compositor) { |
| 801 // A compositor lock that is part of a resize lock timed out. We | 799 // A compositor lock that is part of a resize lock timed out. We |
| 802 // should display a renderer frame. | 800 // should display a renderer frame. |
| 803 if (!compositor->IsLocked() && can_lock_compositor_ == YES_DID_LOCK) { | 801 if (!compositor->IsLocked() && can_lock_compositor_ == YES_DID_LOCK) { |
| 804 can_lock_compositor_ = NO_PENDING_RENDERER_FRAME; | 802 can_lock_compositor_ = NO_PENDING_RENDERER_FRAME; |
| 805 } | 803 } |
| 806 } | 804 } |
| 807 | 805 |
| 808 void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) { | 806 void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 910 new_layer->SetShowSurface( | 908 new_layer->SetShowSurface( |
| 911 cc::SurfaceId(frame_sink_id_, local_frame_id_), | 909 cc::SurfaceId(frame_sink_id_, local_frame_id_), |
| 912 base::Bind(&SatisfyCallback, base::Unretained(manager)), | 910 base::Bind(&SatisfyCallback, base::Unretained(manager)), |
| 913 base::Bind(&RequireCallback, base::Unretained(manager)), | 911 base::Bind(&RequireCallback, base::Unretained(manager)), |
| 914 current_surface_size_, current_scale_factor_, | 912 current_surface_size_, current_scale_factor_, |
| 915 current_frame_size_in_dip_); | 913 current_frame_size_in_dip_); |
| 916 } | 914 } |
| 917 } | 915 } |
| 918 | 916 |
| 919 } // namespace content | 917 } // namespace content |
| OLD | NEW |