Create a public API around webkit::ppapi::PluginInstance and use it in chrome. After this, webkit/p…

content/renderer/pepper/pepper_plugin_delegate_impl.h

 // Copyright (c) 2012 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_PEPPER_PLUGIN_DELEGATE_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_DELEGATE_IMPL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 19 matching lines @@
 class FilePath;
 }
 
 namespace ppapi {
 class PepperFilePath;
 class PPB_X509Certificate_Fields;
 }
 
 namespace webkit {
 namespace ppapi {
-class PluginInstance;
 class PluginModule;
 }
 }
 
 namespace WebKit {
 class WebGamepads;
 struct WebCompositionUnderline;
 }
 
 namespace content {
@@ skipping 46 matching lines @@
   int GetSessionID(PP_DeviceType_Dev type, const std::string& label);
 
  private:
   // RenderViewPepperHelper implementation.
   virtual WebKit::WebPlugin* CreatePepperWebPlugin(
     const WebPluginInfo& webplugin_info,
     const WebKit::WebPluginParams& params) OVERRIDE;
   virtual void ViewWillInitiatePaint() OVERRIDE;
   virtual void ViewInitiatedPaint() OVERRIDE;
   virtual void ViewFlushedPaint() OVERRIDE;
-  virtual webkit::ppapi::PluginInstance* GetBitmapForOptimizedPluginPaint(
+  virtual webkit::ppapi::PluginInstanceImpl* GetBitmapForOptimizedPluginPaint(
       const gfx::Rect& paint_bounds,
       TransportDIB** dib,
       gfx::Rect* location,
       gfx::Rect* clip,
       float* scale_factor) OVERRIDE;
   virtual void OnAsyncFileOpened(base::PlatformFileError error_code,
                                  base::PlatformFile file,
                                  int message_id) OVERRIDE;
   virtual void OnPpapiBrokerChannelCreated(
       int request_id,
@@ skipping 12 matching lines @@
                                   ui::Range* range) const OVERRIDE;
   virtual void OnImeSetComposition(
       const string16& text,
       const std::vector<WebKit::WebCompositionUnderline>& underlines,
       int selection_start,
       int selection_end) OVERRIDE;
   virtual void OnImeConfirmComposition(const string16& text) OVERRIDE;
   virtual void WillHandleMouseEvent() OVERRIDE;
 
   // PluginDelegate implementation.
-  virtual void PluginFocusChanged(webkit::ppapi::PluginInstance* instance,
+  virtual void PluginFocusChanged(webkit::ppapi::PluginInstanceImpl* instance,
                                   bool focused) OVERRIDE;
   virtual void PluginTextInputTypeChanged(
-      webkit::ppapi::PluginInstance* instance) OVERRIDE;
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual void PluginCaretPositionChanged(
-      webkit::ppapi::PluginInstance* instance) OVERRIDE;
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual void PluginRequestedCancelComposition(
-      webkit::ppapi::PluginInstance* instance) OVERRIDE;
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual void PluginSelectionChanged(
-      webkit::ppapi::PluginInstance* instance) OVERRIDE;
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual void SimulateImeSetComposition(
       const string16& text,
       const std::vector<WebKit::WebCompositionUnderline>& underlines,
       int selection_start,
       int selection_end) OVERRIDE;
   virtual void SimulateImeConfirmComposition(const string16& text) OVERRIDE;
-  virtual void PluginCrashed(webkit::ppapi::PluginInstance* instance) OVERRIDE;
+  virtual void PluginCrashed(
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual void InstanceCreated(
-      webkit::ppapi::PluginInstance* instance) OVERRIDE;
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual void InstanceDeleted(
-      webkit::ppapi::PluginInstance* instance) OVERRIDE;
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual scoped_ptr< ::ppapi::thunk::ResourceCreationAPI>
       CreateResourceCreationAPI(
-          webkit::ppapi::PluginInstance* instance) OVERRIDE;
+          webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual SkBitmap* GetSadPluginBitmap() OVERRIDE;
   virtual WebKit::WebPlugin* CreatePluginReplacement(
       const base::FilePath& file_path) OVERRIDE;
   virtual uint32_t GetAudioHardwareOutputSampleRate() OVERRIDE;
   virtual uint32_t GetAudioHardwareOutputBufferSize() OVERRIDE;
   virtual PlatformAudioOutput* CreateAudioOutput(
       uint32_t sample_rate,
       uint32_t sample_count,
       PlatformAudioOutputClient* client) OVERRIDE;
   virtual PlatformAudioInput* CreateAudioInput(
       const std::string& device_id,
       const GURL& document_url,
       uint32_t sample_rate,
       uint32_t sample_count,
       PlatformAudioInputClient* client) OVERRIDE;
   virtual PlatformImage2D* CreateImage2D(int width, int height) OVERRIDE;
   virtual PlatformGraphics2D* GetGraphics2D(
-      webkit::ppapi::PluginInstance* instance,
+      webkit::ppapi::PluginInstanceImpl* instance,
       PP_Resource resource) OVERRIDE;
   virtual PlatformContext3D* CreateContext3D() OVERRIDE;
   virtual PlatformVideoCapture* CreateVideoCapture(
       const std::string& device_id,
       const GURL& document_url,
       PlatformVideoCaptureEventHandler* handler) OVERRIDE;
   virtual PlatformVideoDecoder* CreateVideoDecoder(
       media::VideoDecodeAccelerator::Client* client,
       int32 command_buffer_route_id) OVERRIDE;
   virtual Broker* ConnectToBroker(
@@ skipping 96 matching lines @@
       uint32 socket_id) OVERRIDE;
   virtual bool AddNetworkListObserver(
       webkit_glue::NetworkListObserver* observer) OVERRIDE;
   virtual void RemoveNetworkListObserver(
       webkit_glue::NetworkListObserver* observer) OVERRIDE;
   virtual bool X509CertificateParseDER(
       const std::vector<char>& der,
       ppapi::PPB_X509Certificate_Fields* fields) OVERRIDE;
   virtual webkit::ppapi::FullscreenContainer*
       CreateFullscreenContainer(
-          webkit::ppapi::PluginInstance* instance) OVERRIDE;
+          webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual gfx::Size GetScreenSize() OVERRIDE;
   virtual std::string GetDefaultEncoding() OVERRIDE;
   virtual void ZoomLimitsChanged(double minimum_factor, double maximum_factor)
       OVERRIDE;
   virtual base::SharedMemory* CreateAnonymousSharedMemory(size_t size)
       OVERRIDE;
   virtual ::ppapi::Preferences GetPreferences() OVERRIDE;
-  virtual bool LockMouse(webkit::ppapi::PluginInstance* instance) OVERRIDE;
-  virtual void UnlockMouse(webkit::ppapi::PluginInstance* instance) OVERRIDE;
-  virtual bool IsMouseLocked(webkit::ppapi::PluginInstance* instance) OVERRIDE;
-  virtual void DidChangeCursor(webkit::ppapi::PluginInstance* instance,
+  virtual bool LockMouse(webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
+  virtual void UnlockMouse(
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
+  virtual bool IsMouseLocked(
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
+  virtual void DidChangeCursor(webkit::ppapi::PluginInstanceImpl* instance,
                                const WebKit::WebCursorInfo& cursor) OVERRIDE;
   virtual void DidReceiveMouseEvent(
-      webkit::ppapi::PluginInstance* instance) OVERRIDE;
+      webkit::ppapi::PluginInstanceImpl* instance) OVERRIDE;
   virtual bool IsInFullscreenMode() OVERRIDE;
   virtual void SampleGamepads(WebKit::WebGamepads* data) OVERRIDE;
   virtual bool IsPageVisible() const OVERRIDE;
   virtual int EnumerateDevices(
       PP_DeviceType_Dev type,
       const EnumerateDevicesCallback& callback) OVERRIDE;
   virtual void StopEnumerateDevices(int request_id) OVERRIDE;
   virtual void HandleDocumentLoad(
-      webkit::ppapi::PluginInstance* instance,
+      webkit::ppapi::PluginInstanceImpl* instance,
       const WebKit::WebURLResponse& response) OVERRIDE;
   virtual content::RendererPpapiHost* CreateExternalPluginModule(
       scoped_refptr<webkit::ppapi::PluginModule> module,
       const base::FilePath& path,
       ::ppapi::PpapiPermissions permissions,
       const IPC::ChannelHandle& channel_handle,
       base::ProcessId plugin_pid,
       int plugin_child_id) OVERRIDE;
 
   // RenderViewObserver implementation.
@@ skipping 53 matching lines @@
   RendererPpapiHost* CreateOutOfProcessModule(
       webkit::ppapi::PluginModule* module,
       const base::FilePath& path,
       ppapi::PpapiPermissions permissions,
       const IPC::ChannelHandle& channel_handle,
       base::ProcessId plugin_pid,
       int plugin_child_id,
       bool is_external);
 
   MouseLockDispatcher::LockTarget* GetOrCreateLockTargetAdapter(
-      webkit::ppapi::PluginInstance* instance);
-  void UnSetAndDeleteLockTargetAdapter(webkit::ppapi::PluginInstance* instance);
+      webkit::ppapi::PluginInstanceImpl* instance);
+  void UnSetAndDeleteLockTargetAdapter(
+      webkit::ppapi::PluginInstanceImpl* instance);
 
   MouseLockDispatcher* GetMouseLockDispatcher(
-      webkit::ppapi::PluginInstance* instance);
+      webkit::ppapi::PluginInstanceImpl* instance);
 
   // Share a given handle with the target process.
   virtual IPC::PlatformFileForTransit ShareHandleWithRemote(
       base::PlatformFile handle,
       base::ProcessId target_process_id,
       bool should_close_source) const OVERRIDE;
 
   virtual bool IsRunningInProcess(PP_Instance instance) const OVERRIDE;
 
   // Pointer to the RenderView that owns us.
   RenderViewImpl* render_view_;
 
   // Connection for sending and receiving pepper host-related messages to/from
   // the browser.
   PepperBrowserConnection pepper_browser_connection_;
 
-  std::set<webkit::ppapi::PluginInstance*> active_instances_;
-  typedef std::map<webkit::ppapi::PluginInstance*,
+  std::set<webkit::ppapi::PluginInstanceImpl*> active_instances_;
+  typedef std::map<webkit::ppapi::PluginInstanceImpl*,
                    MouseLockDispatcher::LockTarget*> LockTargetMap;
   LockTargetMap mouse_lock_instances_;
 
   IDMap<AsyncOpenFileCallback> pending_async_open_files_;
 
   IDMap<webkit::ppapi::PPB_TCPSocket_Private_Impl> tcp_sockets_;
 
   IDMap<ppapi::PPB_TCPServerSocket_Shared> tcp_server_sockets_;
 
   typedef IDMap<scoped_refptr<PepperBrokerImpl>, IDMapOwnPointer> BrokerMap;
   BrokerMap pending_connect_broker_;
 
   typedef IDMap<base::WeakPtr<webkit::ppapi::PPB_Broker_Impl> >
       PermissionRequestMap;
   PermissionRequestMap pending_permission_requests_;
 
   // Whether or not the focus is on a PPAPI plugin
-  webkit::ppapi::PluginInstance* focused_plugin_;
+  webkit::ppapi::PluginInstanceImpl* focused_plugin_;
 
   // Current text input composition text. Empty if no composition is in
   // progress.
   string16 composition_text_;
 
   // 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_;
+  webkit::ppapi::PluginInstanceImpl* last_mouse_event_target_;
 
   scoped_ptr<GamepadSharedMemoryReader> gamepad_shared_memory_reader_;
 
   scoped_ptr<PepperDeviceEnumerationEventHandler>
       device_enumeration_event_handler_;
 
   scoped_refptr<ContextProviderCommandBuffer> offscreen_context3d_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPluginDelegateImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_DELEGATE_IMPL_H_