Revert of Make cc output surface creation async

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 778 matching lines @@
 void RenderWidgetCompositor::ApplyViewportDeltas(
     const gfx::Vector2d& scroll_delta,
     float page_scale,
     float top_controls_delta) {
   widget_->webwidget()->applyViewportDeltas(
       scroll_delta,
       page_scale,
       top_controls_delta);
 }
 
-void RenderWidgetCompositor::RequestNewOutputSurface(bool fallback) {
-  layer_tree_host_->SetOutputSurface(widget_->CreateOutputSurface(fallback));
+scoped_ptr<cc::OutputSurface> RenderWidgetCompositor::CreateOutputSurface(
+    bool fallback) {
+  return widget_->CreateOutputSurface(fallback);
 }
 
 void RenderWidgetCompositor::DidInitializeOutputSurface() {
 }
 
 void RenderWidgetCompositor::WillCommit() {
   widget_->InstrumentWillComposite();
 }
 
 void RenderWidgetCompositor::DidCommit() {
@@ skipping 37 matching lines @@
   widget_->OnSwapBuffersAborted();
 }
 
 void RenderWidgetCompositor::RateLimitSharedMainThreadContext() {
   cc::ContextProvider* provider =
       RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content