Revert of Make cc::Display not own its BeginFrameSource

android_webview/browser/surfaces_instance.cc

 // Copyright 2016 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 "android_webview/browser/surfaces_instance.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/aw_render_thread_context_provider.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/parent_output_surface.h"
 #include "base/memory/ptr_util.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/quads/surface_draw_quad.h"
+#include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 namespace android_webview {
@@ skipping 18 matching lines @@
   settings.highp_threshold_min = 2048;
 
   // Webview does not own the surface so should not clear it.
   settings.should_clear_root_render_pass = false;
 
   surface_manager_.reset(new cc::SurfaceManager);
   surface_id_allocator_.reset(
       new cc::SurfaceIdAllocator(next_surface_client_id_++));
   surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
 
+  std::unique_ptr<cc::BeginFrameSource> begin_frame_source(
+      new cc::StubBeginFrameSource);
   std::unique_ptr<cc::TextureMailboxDeleter> texture_mailbox_deleter(
       new cc::TextureMailboxDeleter(nullptr));
   std::unique_ptr<ParentOutputSurface> output_surface_holder(
       new ParentOutputSurface(AwRenderThreadContextProvider::Create(
           gl_surface_, DeferredGpuCommandService::GetInstance())));
   output_surface_ = output_surface_holder.get();
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
-      &begin_frame_source_, nullptr,
+      begin_frame_source.get(), nullptr,
       output_surface_holder->capabilities().max_frames_pending));
   display_.reset(new cc::Display(
       nullptr /* shared_bitmap_manager */,
       nullptr /* gpu_memory_buffer_manager */, settings,
-      &begin_frame_source_, std::move(output_surface_holder),
+      std::move(begin_frame_source), std::move(output_surface_holder),
       std::move(scheduler), std::move(texture_mailbox_deleter)));
   display_->Initialize(this, surface_manager_.get(),
                        surface_id_allocator_->client_id());
   display_->SetVisible(true);
 
   surface_factory_.reset(new cc::SurfaceFactory(surface_manager_.get(), this));
 
   DCHECK(!g_surfaces_instance);
   g_surfaces_instance = this;
 
@@ skipping 103 matching lines @@
   CHECK(resources.empty());
 }
 
 void SurfacesInstance::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // Parent compsitor calls DrawAndSwap directly and doesn't use
   // BeginFrameSource.
 }
 
 }  // namespace android_webview