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

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

Issue 1016033006: Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address dana's comment Created 5 years, 9 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/compositor/delegated_frame_host.h" 5 #include "content/browser/compositor/delegated_frame_host.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "cc/output/compositor_frame.h" 9 #include "cc/output/compositor_frame.h"
10 #include "cc/output/compositor_frame_ack.h" 10 #include "cc/output/compositor_frame_ack.h"
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 can_lock_compositor_ = NO_PENDING_RENDERER_FRAME; 898 can_lock_compositor_ = NO_PENDING_RENDERER_FRAME;
899 } 899 }
900 } 900 }
901 901
902 void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) { 902 void DelegatedFrameHost::OnCompositingShuttingDown(ui::Compositor* compositor) {
903 DCHECK_EQ(compositor, compositor_); 903 DCHECK_EQ(compositor, compositor_);
904 ResetCompositor(); 904 ResetCompositor();
905 DCHECK(!compositor_); 905 DCHECK(!compositor_);
906 } 906 }
907 907
908 void DelegatedFrameHost::OnUpdateVSyncParameters( 908 void DelegatedFrameHost::SetVSyncParameters(base::TimeTicks timebase,
909 base::TimeTicks timebase, 909 base::TimeDelta interval) {
910 base::TimeDelta interval) {
911 vsync_timebase_ = timebase; 910 vsync_timebase_ = timebase;
912 vsync_interval_ = interval; 911 vsync_interval_ = interval;
913 if (client_->DelegatedFrameHostIsVisible())
914 client_->DelegatedFrameHostUpdateVSyncParameters(timebase, interval);
915 } 912 }
916 913
917 //////////////////////////////////////////////////////////////////////////////// 914 ////////////////////////////////////////////////////////////////////////////////
918 // DelegatedFrameHost, ImageTransportFactoryObserver implementation: 915 // DelegatedFrameHost, ImageTransportFactoryObserver implementation:
919 916
920 void DelegatedFrameHost::OnLostResources() { 917 void DelegatedFrameHost::OnLostResources() {
921 if (frame_provider_.get() || !surface_id_.is_null()) 918 if (frame_provider_.get() || !surface_id_.is_null())
922 EvictDelegatedFrame(); 919 EvictDelegatedFrame();
923 idle_frame_subscriber_textures_.clear(); 920 idle_frame_subscriber_textures_.clear();
924 yuv_readback_pipeline_.reset(); 921 yuv_readback_pipeline_.reset();
(...skipping 10 matching lines...) Expand all
935 frame_subscriber_callbacks_.pop_front(); 932 frame_subscriber_callbacks_.pop_front();
936 } 933 }
937 934
938 DCHECK(!compositor_); 935 DCHECK(!compositor_);
939 ImageTransportFactory::GetInstance()->RemoveObserver(this); 936 ImageTransportFactory::GetInstance()->RemoveObserver(this);
940 937
941 if (!surface_id_.is_null()) 938 if (!surface_id_.is_null())
942 surface_factory_->Destroy(surface_id_); 939 surface_factory_->Destroy(surface_id_);
943 if (resource_collection_.get()) 940 if (resource_collection_.get())
944 resource_collection_->SetClient(NULL); 941 resource_collection_->SetClient(NULL);
945
946 DCHECK(!vsync_manager_.get());
947 } 942 }
948 943
949 void DelegatedFrameHost::RunOnCommitCallbacks() { 944 void DelegatedFrameHost::RunOnCommitCallbacks() {
950 for (std::vector<base::Closure>::const_iterator 945 for (std::vector<base::Closure>::const_iterator
951 it = on_compositing_did_commit_callbacks_.begin(); 946 it = on_compositing_did_commit_callbacks_.begin();
952 it != on_compositing_did_commit_callbacks_.end(); ++it) { 947 it != on_compositing_did_commit_callbacks_.end(); ++it) {
953 it->Run(); 948 it->Run();
954 } 949 }
955 on_compositing_did_commit_callbacks_.clear(); 950 on_compositing_did_commit_callbacks_.clear();
956 } 951 }
957 952
958 void DelegatedFrameHost::AddOnCommitCallbackAndDisableLocks( 953 void DelegatedFrameHost::AddOnCommitCallbackAndDisableLocks(
959 const base::Closure& callback) { 954 const base::Closure& callback) {
960 DCHECK(compositor_); 955 DCHECK(compositor_);
961 956
962 can_lock_compositor_ = NO_PENDING_COMMIT; 957 can_lock_compositor_ = NO_PENDING_COMMIT;
963 if (!callback.is_null()) 958 if (!callback.is_null())
964 on_compositing_did_commit_callbacks_.push_back(callback); 959 on_compositing_did_commit_callbacks_.push_back(callback);
965 } 960 }
966 961
967 void DelegatedFrameHost::SetCompositor(ui::Compositor* compositor) { 962 void DelegatedFrameHost::SetCompositor(ui::Compositor* compositor) {
968 DCHECK(!compositor_); 963 DCHECK(!compositor_);
969 if (!compositor) 964 if (!compositor)
970 return; 965 return;
971 compositor_ = compositor; 966 compositor_ = compositor;
972 compositor_->AddObserver(this); 967 compositor_->AddObserver(this);
973 DCHECK(!vsync_manager_.get());
974 vsync_manager_ = compositor_->vsync_manager();
975 vsync_manager_->AddObserver(this);
976 } 968 }
977 969
978 void DelegatedFrameHost::ResetCompositor() { 970 void DelegatedFrameHost::ResetCompositor() {
979 if (!compositor_) 971 if (!compositor_)
980 return; 972 return;
981 RunOnCommitCallbacks(); 973 RunOnCommitCallbacks();
982 if (resize_lock_) { 974 if (resize_lock_) {
983 resize_lock_.reset(); 975 resize_lock_.reset();
984 client_->DelegatedFrameHostResizeLockWasReleased(); 976 client_->DelegatedFrameHostResizeLockWasReleased();
985 } 977 }
986 if (compositor_->HasObserver(this)) 978 if (compositor_->HasObserver(this))
987 compositor_->RemoveObserver(this); 979 compositor_->RemoveObserver(this);
988 if (vsync_manager_.get()) {
989 vsync_manager_->RemoveObserver(this);
990 vsync_manager_ = NULL;
991 }
992 compositor_ = nullptr; 980 compositor_ = nullptr;
993 } 981 }
994 982
995 void DelegatedFrameHost::LockResources() { 983 void DelegatedFrameHost::LockResources() {
996 DCHECK(frame_provider_.get() || !surface_id_.is_null()); 984 DCHECK(frame_provider_.get() || !surface_id_.is_null());
997 delegated_frame_evictor_->LockFrame(); 985 delegated_frame_evictor_->LockFrame();
998 } 986 }
999 987
1000 void DelegatedFrameHost::RequestCopyOfOutput( 988 void DelegatedFrameHost::RequestCopyOfOutput(
1001 scoped_ptr<cc::CopyOutputRequest> request) { 989 scoped_ptr<cc::CopyOutputRequest> request) {
(...skipping 25 matching lines...) Expand all
1027 cc::SurfaceManager* manager = factory->GetSurfaceManager(); 1015 cc::SurfaceManager* manager = factory->GetSurfaceManager();
1028 new_layer->SetShowSurface( 1016 new_layer->SetShowSurface(
1029 surface_id_, base::Bind(&SatisfyCallback, base::Unretained(manager)), 1017 surface_id_, base::Bind(&SatisfyCallback, base::Unretained(manager)),
1030 base::Bind(&RequireCallback, base::Unretained(manager)), 1018 base::Bind(&RequireCallback, base::Unretained(manager)),
1031 current_surface_size_, current_scale_factor_, 1019 current_surface_size_, current_scale_factor_,
1032 current_frame_size_in_dip_); 1020 current_frame_size_in_dip_);
1033 } 1021 }
1034 } 1022 }
1035 1023
1036 } // namespace content 1024 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698