Retry 3 to split WebGraphicsContext3DCommandBufferImpl::initialize() into two stages.

content/renderer/render_widget.cc

 // Copyright (c) 2011 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/render_widget.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 904 matching lines @@
       this, &RenderWidget::InvalidationCallback));
 }
 
 void RenderWidget::didActivateAcceleratedCompositing(bool active) {
   TRACE_EVENT1("gpu", "RenderWidget::didActivateAcceleratedCompositing",
                "active", active);
   is_accelerated_compositing_active_ = active;
   Send(new ViewHostMsg_DidActivateAcceleratedCompositing(
       routing_id_, is_accelerated_compositing_active_));
 
+#ifndef WTF_USE_THREADED_COMPOSITING
   if (active)
     using_asynchronous_swapbuffers_ = SupportsAsynchronousSwapBuffers();
   else if (using_asynchronous_swapbuffers_)
     using_asynchronous_swapbuffers_ = false;
+#endif
 }
 
 void RenderWidget::scheduleComposite() {
 #if WTF_USE_THREADED_COMPOSITING
   NOTREACHED();
 #else
   // TODO(nduca): replace with something a little less hacky.  The reason this
   // hack is still used is because the Invalidate-DoDeferredUpdate loop
   // contains a lot of host-renderer synchronization logic that is still
   // important for the accelerated compositing case. The option of simply
@@ skipping 445 matching lines @@
 
 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }