Remove uses of external begin frame sources

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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/renderer/gpu/render_widget_compositor.h"
 
 #include <stddef.h>
 #include <limits>
 #include <string>
 #include <utility>
@@ skipping 223 matching lines @@
       GenerateLayerTreeSettings(*cmd, compositor_deps_, device_scale_factor);
   cc::LayerTreeHost::InitParams params;
   params.client = this;
   params.shared_bitmap_manager = compositor_deps_->GetSharedBitmapManager();
   params.gpu_memory_buffer_manager =
       compositor_deps_->GetGpuMemoryBufferManager();
   params.settings = &settings;
   params.task_graph_runner = compositor_deps_->GetTaskGraphRunner();
   params.main_task_runner =
       compositor_deps_->GetCompositorMainThreadTaskRunner();
-  if (settings.use_external_begin_frame_source) {
-    params.external_begin_frame_source =
-        delegate_->CreateExternalBeginFrameSource();
-  } else {
-    DCHECK(settings.use_output_surface_begin_frame_source);
-  }
   params.animation_host = cc::AnimationHost::CreateMainInstance();
+  DCHECK(settings.use_output_surface_begin_frame_source);
 
   if (cmd->HasSwitch(switches::kUseRemoteCompositing)) {
     DCHECK(!threaded_);
     params.image_serialization_processor =
         compositor_deps_->GetImageSerializationProcessor();
     layer_tree_host_ = cc::LayerTreeHost::CreateRemoteServer(this, &params);
   } else if (!threaded_) {
     // Single-threaded layout tests.
     layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(this, &params);
   } else {
@@ skipping 207 matching lines @@
     settings.software_decoded_image_budget_bytes = 128 * 1024 * 1024;
   }
 
 #endif  // defined(OS_ANDROID)
 
   if (cmd.HasSwitch(switches::kEnableLowResTiling))
     settings.create_low_res_tiling = true;
   if (cmd.HasSwitch(switches::kDisableLowResTiling))
     settings.create_low_res_tiling = false;
 
-  // TODO(enne): fold external BFS into output surface BFS.
-  if (cmd.HasSwitch(switches::kUseRemoteCompositing)) {
-    settings.use_output_surface_begin_frame_source = true;
-    settings.use_external_begin_frame_source = false;
-  } else {
-    settings.use_output_surface_begin_frame_source = false;
-    settings.use_external_begin_frame_source = true;
-  }
-
   if (cmd.HasSwitch(switches::kEnableRGBA4444Textures) &&
       !cmd.HasSwitch(switches::kDisableRGBA4444Textures)) {
     settings.renderer_settings.preferred_tile_format = cc::RGBA_4444;
   }
 
   if (cmd.HasSwitch(cc::switches::kEnableTileCompression)) {
     settings.renderer_settings.preferred_tile_format = cc::ETC1;
   }
 
   settings.max_staging_buffer_usage_in_bytes = 32 * 1024 * 1024;  // 32MB
@@ skipping 644 matching lines @@
 
   remote_proto_channel_receiver_->OnProtoReceived(std::move(deserialized));
 }
 
 void RenderWidgetCompositor::SetPaintedDeviceScaleFactor(
     float device_scale) {
   layer_tree_host_->GetLayerTree()->SetPaintedDeviceScaleFactor(device_scale);
 }
 
 }  // namespace content