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

content/renderer/pepper_plugin_delegate_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.
 
 #include "content/renderer/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <queue>
 
 #include "base/bind.h"
@@ skipping 883 matching lines @@
     PepperPluginDelegateImpl::CreateContext3D() {
 #ifdef ENABLE_GPU
   // If accelerated compositing of plugins is disabled, fail to create a 3D
   // context, because it won't be visible. This allows graceful fallback in the
   // modules.
   if (!render_view_->webkit_preferences().accelerated_plugins_enabled)
     return NULL;
   WebGraphicsContext3DCommandBufferImpl* context =
       static_cast<WebGraphicsContext3DCommandBufferImpl*>(
           render_view_->webview()->graphicsContext3D());
-  if (!context || context->isContextLost())
+  if (!context)
+    return NULL;
+  if (!context->makeContextCurrent() || context->isContextLost())
     return NULL;
 
   RendererGLContext* parent_context = context->context();
   if (!parent_context)
     return NULL;
 
   return new PlatformContext3DImpl(parent_context);
 #else
   return NULL;
 #endif
@@ skipping 561 matching lines @@
 
 int PepperPluginDelegateImpl::GetRoutingId() const {
   return render_view_->routing_id();
 }
 
 void PepperPluginDelegateImpl::PublishInitialPolicy(
     scoped_refptr<webkit::ppapi::PluginInstance> instance,
     const std::string& policy) {
   instance->HandlePolicyUpdate(policy);
 }