Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Side by Side Diff: content/browser/renderer_host/delegated_frame_host.cc

Issue 2776973004: Remove CompositorObserver::OnCompositingEnded() (Closed)
Patch Set: Revert last patch and fix Mac compiling error Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 // if necessary. 732 // if necessary.
733 MaybeCreateResizeLock(); 733 MaybeCreateResizeLock();
734 } 734 }
735 } 735 }
736 736
737 void DelegatedFrameHost::OnCompositingStarted(ui::Compositor* compositor, 737 void DelegatedFrameHost::OnCompositingStarted(ui::Compositor* compositor,
738 base::TimeTicks start_time) { 738 base::TimeTicks start_time) {
739 last_draw_ended_ = start_time; 739 last_draw_ended_ = start_time;
740 } 740 }
741 741
742 void DelegatedFrameHost::OnCompositingEnded(ui::Compositor* compositor) {}
743
744 void DelegatedFrameHost::OnCompositingLockStateChanged( 742 void DelegatedFrameHost::OnCompositingLockStateChanged(
745 ui::Compositor* compositor) { 743 ui::Compositor* compositor) {
746 // A compositor lock that is part of a resize lock timed out. We 744 // A compositor lock that is part of a resize lock timed out. We
747 // should display a renderer frame. 745 // should display a renderer frame.
748 if (!compositor->IsLocked() && can_lock_compositor_ == YES_DID_LOCK) { 746 if (!compositor->IsLocked() && can_lock_compositor_ == YES_DID_LOCK) {
749 can_lock_compositor_ = NO_PENDING_RENDERER_FRAME; 747 can_lock_compositor_ = NO_PENDING_RENDERER_FRAME;
750 } 748 }
751 } 749 }
752 750
753 void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) { 751 void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 } 872 }
875 873
876 if (!skipped_frames_) { 874 if (!skipped_frames_) {
877 latest_confirmed_begin_frame_source_id_ = ack.source_id; 875 latest_confirmed_begin_frame_source_id_ = ack.source_id;
878 latest_confirmed_begin_frame_sequence_number_ = 876 latest_confirmed_begin_frame_sequence_number_ =
879 ack.latest_confirmed_sequence_number; 877 ack.latest_confirmed_sequence_number;
880 } 878 }
881 } 879 }
882 880
883 } // namespace content 881 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698