DelegatedFrameHost should not create an ExternalBeginFrameSource

content/browser/renderer_host/browser_compositor_view_mac.mm

 // 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/renderer_host/browser_compositor_view_mac.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 264 matching lines @@
   // Compute the frame size based on the root render pass rect size.
   cc::RenderPass* root_pass = frame.render_pass_list.back().get();
   float scale_factor = frame.metadata.device_scale_factor;
   gfx::Size pixel_size = root_pass->output_rect.size();
   gfx::Size dip_size = gfx::ConvertSizeToDIP(scale_factor, pixel_size);
   root_layer_->SetBounds(gfx::Rect(dip_size));
   if (recyclable_compositor_) {
     recyclable_compositor_->compositor()->SetScaleAndSize(scale_factor,
                                                           pixel_size);
   }
-  cc::BeginFrameAck ack(frame.metadata.begin_frame_ack);
   delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id,
                                             local_surface_id, std::move(frame));
-  if (begin_frame_source_)
-    begin_frame_source_->DidFinishFrame(this, ack);
 }
 
 void BrowserCompositorMac::OnBeginFrameDidNotSwap(
     const cc::BeginFrameAck& ack) {
-  if (begin_frame_source_)
-    begin_frame_source_->DidFinishFrame(this, ack);
+  delegated_frame_host_->DidFinishFrame(ack);
 }
 
 void BrowserCompositorMac::SetHasTransparentBackground(bool transparent) {
   has_transparent_background_ = transparent;
   if (recyclable_compositor_) {
     recyclable_compositor_->compositor()->SetHostHasTransparentBackground(
         has_transparent_background_);
   }
 }
 
@@ skipping 85 matching lines @@
   }
 }
 
 // static
 void BrowserCompositorMac::DisableRecyclingForShutdown() {
   g_has_shut_down = true;
   g_spare_recyclable_compositors.Get().clear();
 }
 
 void BrowserCompositorMac::SetNeedsBeginFrames(bool needs_begin_frames) {
-  if (needs_begin_frames_ == needs_begin_frames)
-    return;
-
-  needs_begin_frames_ = needs_begin_frames;
-  if (begin_frame_source_) {
-    if (needs_begin_frames_)
-      begin_frame_source_->AddObserver(this);
-    else
-      begin_frame_source_->RemoveObserver(this);
-  }
+  delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DelegatedFrameHost, public:
 
 ui::Layer* BrowserCompositorMac::DelegatedFrameHostGetLayer() const {
   return root_layer_.get();
 }
 
 bool BrowserCompositorMac::DelegatedFrameHostIsVisible() const {
@@ skipping 27 matching lines @@
 }
 
 void BrowserCompositorMac::DelegatedFrameHostSendReclaimCompositorResources(
     int compositor_frame_sink_id,
     bool is_swap_ack,
     const cc::ReturnedResourceArray& resources) {
   client_->BrowserCompositorMacSendReclaimCompositorResources(
       compositor_frame_sink_id, is_swap_ack, resources);
 }
 
-void BrowserCompositorMac::SetBeginFrameSource(cc::BeginFrameSource* source) {
-  if (begin_frame_source_ && needs_begin_frames_)
-    begin_frame_source_->RemoveObserver(this);
-  begin_frame_source_ = source;
-  if (begin_frame_source_ && needs_begin_frames_)
-    begin_frame_source_->AddObserver(this);
+void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) {
+  client_->BrowserCompositorMacSendBeginFrame(args);
 }
 
 bool BrowserCompositorMac::IsAutoResizeEnabled() const {
   NOTREACHED();
   return false;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// cc::BeginFrameSourceBase, public:
-
-void BrowserCompositorMac::OnBeginFrame(const cc::BeginFrameArgs& args) {
-  client_->BrowserCompositorMacSendBeginFrame(args);
-  last_begin_frame_args_ = args;
-}
-
-const cc::BeginFrameArgs& BrowserCompositorMac::LastUsedBeginFrameArgs() const {
-  return last_begin_frame_args_;
-}
-
-void BrowserCompositorMac::OnBeginFrameSourcePausedChanged(bool paused) {
-  // Only used on Android WebView.
-}
-
 }  // namespace content