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

content/renderer/pepper_plugin_delegate_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_
 #pragma once
 
 #include <set>
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
+#include "content/renderer/pepper_parent_context_provider.h"
 #include "ppapi/proxy/broker_dispatcher.h"
 #include "ppapi/proxy/proxy_channel.h"
 #include "ui/base/ime/text_input_type.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
 
 class FilePath;
 class PepperPluginDelegateImpl;
 class RenderViewImpl;
@@ skipping 84 matching lines @@
   // Always set and cleared at the same time as the module's pointer to this.
   webkit::ppapi::PluginModule* plugin_module_;
 
   base::WeakPtr<PepperPluginDelegateImpl> delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiBrokerImpl);
 };
 
 class PepperPluginDelegateImpl
     : public webkit::ppapi::PluginDelegate,
-      public base::SupportsWeakPtr<PepperPluginDelegateImpl> {
+      public base::SupportsWeakPtr<PepperPluginDelegateImpl>,
+      public PepperParentContextProvider {
  public:
   explicit PepperPluginDelegateImpl(RenderViewImpl* render_view);
   virtual ~PepperPluginDelegateImpl();
 
   // Attempts to create a PPAPI plugin for the given filepath. On success, it
   // will return the newly-created module.
   //
   // There are two reasons for failure. The first is that the plugin isn't
   // a PPAPI plugin. In this case, |*pepper_plugin_was_registered| will be set
   // to false and the caller may want to fall back on creating an NPAPI plugin.
@@ skipping 218 matching lines @@
       const std::string& policy);
 
   // Asynchronously attempts to create a PPAPI broker for the given plugin.
   scoped_refptr<PpapiBrokerImpl> CreatePpapiBroker(
       webkit::ppapi::PluginModule* plugin_module);
 
   bool MouseLockedOrPending() const {
     return mouse_locked_ || pending_lock_request_ || pending_unlock_request_;
   }
 
+  // Implementation of PepperParentContextProvider.
+  virtual RendererGLContext* GetParentContextForPlatformContext3D();
+
   // Pointer to the RenderView that owns us.
   RenderViewImpl* render_view_;
 
   std::set<webkit::ppapi::PluginInstance*> active_instances_;
 
   // Used to send a single context menu "completion" upon menu close.
   bool has_saved_context_menu_action_;
   unsigned saved_context_menu_action_;
 
   IDMap<AsyncOpenFileCallback> pending_async_open_files_;
@@ skipping 36 matching lines @@
   // The plugin instance that received the last mouse event. It is set to NULL
   // if the last mouse event went to elements other than Pepper plugins.
   // |last_mouse_event_target_| is not owned by this class. We can know about
   // when it is destroyed via InstanceDeleted().
   webkit::ppapi::PluginInstance* last_mouse_event_target_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPluginDelegateImpl);
 };
 
 #endif  // CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_IMPL_H_