cc: Fix multiple outstanding output surface requests

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 <limits>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 406 matching lines @@
       compositor_deps_->GetSharedBitmapManager();
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       compositor_deps_->GetGpuMemoryBufferManager();
 
   scoped_ptr<cc::BeginFrameSource> external_begin_frame_source;
   if (settings.use_external_begin_frame_source) {
     external_begin_frame_source =
         compositor_deps_->CreateExternalBeginFrameSource(widget_->routing_id());
   }
 
+  FinalizeSettings(&settings);
+
   if (compositor_thread_task_runner.get()) {
     layer_tree_host_ = cc::LayerTreeHost::CreateThreaded(
         this, shared_bitmap_manager, gpu_memory_buffer_manager, settings,
         main_thread_compositor_task_runner, compositor_thread_task_runner,
         external_begin_frame_source.Pass());
   } else {
     layer_tree_host_ = cc::LayerTreeHost::CreateSingleThreaded(
         this, this, shared_bitmap_manager, gpu_memory_buffer_manager, settings,
         main_thread_compositor_task_runner, external_begin_frame_source.Pass());
   }
   DCHECK(layer_tree_host_);
 }
 
+void RenderWidgetCompositor::FinalizeSettings(
+    cc::LayerTreeSettings* settings) const {
+}

[danakj, 2015/01/27 01:46:37]

Add a comment here somewhere this if for tests?

+
 RenderWidgetCompositor::~RenderWidgetCompositor() {}
 
 const base::WeakPtr<cc::InputHandler>&
 RenderWidgetCompositor::GetInputHandler() {
   return layer_tree_host_->GetInputHandler();
 }
 
 bool RenderWidgetCompositor::BeginMainFrameRequested() const {
   return layer_tree_host_->BeginMainFrameRequested();
 }
@@ skipping 420 matching lines @@
   widget_->OnSwapBuffersAborted();
 }
 
 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
   cc::ContextProvider* provider =
       compositor_deps_->GetSharedMainThreadContextProvider();
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content