Merge 106394 - Fixed bugs with Pepper 3D under dynamic GPU switching.

content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.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.
 
 #if defined(ENABLE_GPU)
 
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "gpu/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
@@ skipping 73 matching lines @@
     return false;
 
   // The noExtensions and canRecoverFromContextLoss flags are
   // currently used as hints that we are creating a context on
   // behalf of WebGL or accelerated 2D canvas, respectively.
   if (attributes.noExtensions || !attributes.canRecoverFromContextLoss)
     gpu_preference_ = gfx::PreferDiscreteGpu;
 
   bool retry = false;
 
+  // Note similar code in Pepper PlatformContext3DImpl::Init.
   do {
     host_ = render_thread->EstablishGpuChannelSync(
         content::
         CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE);
     if (!host_)
       return false;
     DCHECK(host_->state() == GpuChannelHost::kConnected);
 
     if (!retry) {
       // If the creation of this context requires all contexts for this
@@ skipping 1040 matching lines @@
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
   RenderViewImpl* renderview =
       web_view_ ? RenderViewImpl::FromWebView(web_view_) : NULL;
   if (renderview)
     renderview->OnViewContextSwapBuffersAborted();
 }
 
 #endif  // defined(ENABLE_GPU)