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

content/renderer/render_widget_fullscreen_pepper.cc

Index: content/renderer/render_widget_fullscreen_pepper.cc
===================================================================
--- content/renderer/render_widget_fullscreen_pepper.cc	(revision 106439)
+++ content/renderer/render_widget_fullscreen_pepper.cc	(working copy)
@@ -277,13 +277,8 @@
 
 webkit::ppapi::PluginDelegate::PlatformContext3D*
 RenderWidgetFullscreenPepper::CreateContext3D() {
-  if (!context_) {
-    CreateContext();
-  }
-  if (!context_)
-    return NULL;
 #ifdef ENABLE_GPU
-  return new PlatformContext3DImpl(context_);
+  return new PlatformContext3DImpl(this);
 #else
   return NULL;
 #endif
@@ -513,3 +508,13 @@
 void RenderWidgetFullscreenPepper::OnSwapBuffersCompleteByRendererGLContext() {
   OnSwapBuffersComplete();
 }
+
+RendererGLContext*
+RenderWidgetFullscreenPepper::GetParentContextForPlatformContext3D() {
+  if (!context_) {
+    CreateContext();
+  }
+  if (!context_)
+    return NULL;
+  return context_;
+}