cc: Plumbing for BeginFrameSource based on Surfaces

content/browser/compositor/delegated_frame_host.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/compositor/delegated_frame_host.h"
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/time/default_tick_clock.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 43 matching lines @@
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DelegatedFrameHost
 
 DelegatedFrameHost::DelegatedFrameHost(DelegatedFrameHostClient* client)
     : client_(client),
       compositor_(nullptr),
       use_surfaces_(UseSurfacesEnabled()),
+      current_begin_frame_source_(nullptr),
       tick_clock_(new base::DefaultTickClock()),
       last_output_surface_id_(0),
       pending_delegated_ack_count_(0),
       skipped_frames_(false),
       current_scale_factor_(1.f),
       can_lock_compositor_(YES_CAN_LOCK),
       delegated_frame_evictor_(new DelegatedFrameEvictor(this)) {
+  SetCurrentBeginFrameSource(nullptr);
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   factory->AddObserver(this);
   id_allocator_ = factory->GetContextFactory()->CreateSurfaceIdAllocator();
 }
 
+void DelegatedFrameHost::SetCurrentBeginFrameSource(BeginFrameSource* new_bfs) {
+  if (!new_bfs) {
+    // FIXME(mithro): Add a OrphanedBeginFrameSource
+    // FIXME(mithro): We can probably figure out a better BeginFrameSource to use here using what the DelegatedFrameHost.
+    new_bfs = OrphanedBeginFrameSource::getSource();
+  }
+
+  // FIXME(mithro): This will need some of the BeginFrameSourceMultiplexer stuff....
+  if (new_bfs != current_begin_frame_source_) {
+    if (current_begin_frame_source_)
+      current_begin_frame_source_->RemoveObserver(this);
+    current_begin_frame_source_ = new_bfs;
+    current_begin_frame_source_->AddObserver(this);
+  }
+}
+
 void DelegatedFrameHost::WasShown(const ui::LatencyInfo& latency_info) {
   delegated_frame_evictor_->SetVisible(true);
 
   if (surface_id_.is_null() && !frame_provider_.get() &&
       !released_front_lock_.get()) {
     if (compositor_)
       released_front_lock_ = compositor_->GetCompositorLock();
   }
 
   if (compositor_) {
@@ skipping 387 matching lines @@
   } else {
     AddOnCommitCallbackAndDisableLocks(base::Closure());
   }
   DidReceiveFrameFromRenderer(damage_rect);
   if (frame_provider_.get() || !surface_id_.is_null())
     delegated_frame_evictor_->SwappedFrame(
         client_->DelegatedFrameHostIsVisible());
   // Note: the frame may have been evicted immediately.
 }
 
+void DelegatedFrameHost::SetBeginFrameSource(SurfaceId id, BeginFrameSource* new_bfs) {
+  if (id != surface_id_) return;
+  SetCurrentBeginFrameSource(new_bfs);
+}
+
 void DelegatedFrameHost::SendDelegatedFrameAck(uint32 output_surface_id) {
   cc::CompositorFrameAck ack;
   if (!surface_returned_resources_.empty())
     ack.resources.swap(surface_returned_resources_);
   if (resource_collection_.get())
     resource_collection_->TakeUnusedResourcesForChildCompositor(&ack.resources);
   client_->DelegatedFrameHostSendCompositorSwapAck(output_surface_id, ack);
   DCHECK_GT(pending_delegated_ack_count_, 0);
   pending_delegated_ack_count_--;
 }
@@ skipping 441 matching lines @@
 
 DelegatedFrameHost::~DelegatedFrameHost() {
   DCHECK(!compositor_);
   ImageTransportFactory::GetInstance()->RemoveObserver(this);
 
   if (!surface_id_.is_null())
     surface_factory_->Destroy(surface_id_);
   if (resource_collection_.get())
     resource_collection_->SetClient(NULL);
 
+  DCHECK_EQ(current_begin_frame_source_, OrphanBeginFrameSource::getSource());
+  current_begin_frame_source_->RemoveObserver(this);
+  current_begin_frame_source_ = NULL;
+
   DCHECK(!vsync_manager_.get());
 }
 
 void DelegatedFrameHost::RunOnCommitCallbacks() {
   for (std::vector<base::Closure>::const_iterator
       it = on_compositing_did_commit_callbacks_.begin();
       it != on_compositing_did_commit_callbacks_.end(); ++it) {
     it->Run();
   }
   on_compositing_did_commit_callbacks_.clear();
@@ skipping 77 matching lines @@
     cc::SurfaceManager* manager = factory->GetSurfaceManager();
     new_layer->SetShowSurface(
         surface_id_, base::Bind(&SatisfyCallback, base::Unretained(manager)),
         base::Bind(&RequireCallback, base::Unretained(manager)),
         current_surface_size_, current_scale_factor_,
         current_frame_size_in_dip_);
   }
 }
 
 }  // namespace content