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

content/renderer/render_widget_fullscreen_pepper.h

Index: content/renderer/render_widget_fullscreen_pepper.h
===================================================================
--- content/renderer/render_widget_fullscreen_pepper.h	(revision 106439)
+++ content/renderer/render_widget_fullscreen_pepper.h	(working copy)
@@ -6,6 +6,7 @@
 #define CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_
 
 #include "base/memory/weak_ptr.h"
+#include "content/renderer/pepper_parent_context_provider.h"
 #include "content/renderer/render_widget_fullscreen.h"
 #include "content/renderer/gpu/renderer_gl_context.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h"
@@ -23,7 +24,8 @@
 // FullscreenContainer that the plugin instance can callback into to e.g.
 // invalidate rects.
 class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
-                                     public webkit::ppapi::FullscreenContainer {
+                                     public webkit::ppapi::FullscreenContainer,
+                                     public PepperParentContextProvider {
  public:
   static RenderWidgetFullscreenPepper* Create(
       int32 opener_id,
@@ -86,6 +88,9 @@
   // RenderWidget::OnSwapBuffersCompleted.
   void OnSwapBuffersCompleteByRendererGLContext();
 
+  // Implementation of PepperParentContextProvider.
+  virtual RendererGLContext* GetParentContextForPlatformContext3D();
+
   // URL that is responsible for this widget, passed to ggl::CreateViewContext.
   GURL active_url_;