Hide knowledge of webkit::ppapi::Plugin from chrome. This is part of moving ppapi implementation fr…

webkit/plugins/ppapi/ppapi_plugin_instance.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 WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 17 matching lines @@
 #include "ppapi/c/pp_time.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/c/ppp_graphics_3d.h"
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/c/ppp_messaging.h"
 #include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/c/private/ppb_content_decryptor_private.h"
-#include "ppapi/c/private/ppb_nacl_private.h"
 #include "ppapi/c/private/ppp_instance_private.h"
 #include "ppapi/shared_impl/ppb_instance_shared.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
 #include "ppapi/shared_impl/singleton_resource_id.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/ppb_gamepad_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebPlugin.h"
 #include "third_party/WebKit/public/web/WebUserGestureToken.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/ppp_pdf.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 struct PP_Point;
 struct _NPP;
 
 class SkBitmap;
 class TransportDIB;
 
+namespace IPC {
+struct ChannelHandle;
+}
+
 namespace WebKit {
 class WebInputEvent;
 class WebLayer;
 class WebMouseEvent;
 class WebPluginContainer;
 class WebURLLoader;
 class WebURLResponse;
 struct WebCompositionUnderline;
 struct WebCursorInfo;
 struct WebURLError;
 struct WebPrintParams;
 }
 
 namespace cc {
 class TextureLayer;
 }
 
 namespace content {
 class RenderView;
 }
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace ppapi {
+class PpapiPermissions;
+class Resource;
 struct InputEventData;
 struct PPP_Instance_Combined;
-class Resource;
 struct URLRequestInfoData;
 }
 
 namespace ui {
 class Range;
 }
 
 namespace v8 {
 class Isolate;
 }
@@ skipping 384 matching lines @@
   virtual void DeliverFrame(PP_Instance instance,
                             PP_Resource decrypted_frame,
                             const PP_DecryptedFrameInfo* frame_info) OVERRIDE;
   virtual void DeliverSamples(PP_Instance instance,
                               PP_Resource audio_frames,
                               const PP_DecryptedBlockInfo* block_info) OVERRIDE;
 
   // Reset this instance as proxied. Assigns the instance a new module, resets
   // cached interfaces to point to the out-of-process proxy and re-sends
   // DidCreate, DidChangeView, and HandleDocumentLoad (if necessary).
   // This should be used only when switching a trusted NaCl in-process instance

[bbudge, 2013/07/23 23:59:58]

s/NaCl//

   // to an untrusted NaCl out-of-process instance.
-  PP_NaClResult ResetAsProxied(scoped_refptr<PluginModule> module);
+  PP_ExternalPluginResult ResetAsProxied(scoped_refptr<PluginModule> module);
 
   // Checks whether this is a valid instance of the given module. After calling
   // ResetAsProxied above, a NaCl plugin instance's module changes, so external

[bbudge, 2013/07/23 23:59:58]

s/a NaCl/an external/

[jam, 2013/07/24 05:07:39]

Done.

   // hosts won't recognize it as a valid instance of the original module. This
   // method fixes that be checking that either module_ or original_module_ match
   // the given module.
   bool IsValidInstanceOf(PluginModule* module);
 
   // Returns the plugin NPP identifier that this plugin will use to identify
   // itself when making NPObject scripting calls to WebBindings.
   struct _NPP* instanceNPP();
 
   // Returns the v8::Isolate that was current when this Instance was created.
   // This is not inlined so as to avoid an unnecessary header include of v8.h.
   v8::Isolate* GetIsolate() const;
 
   // Returns a reference to a file with the given path.
   // The returned object will have a refcount of 0 (just like "new").
   PP_Resource CreateExternalFileReference(
       const base::FilePath& external_file_path);
 
   // Creates a PPB_ImageData given a Skia image.
   PP_Resource CreateImage(gfx::ImageSkia* source_image, float scale);
 
+  // Returns the location of this module.
+  base::FilePath GetModulePath();
+
+  // Switches this instance with one that uses the out of process IPC proxy.
+  PP_ExternalPluginResult SwitchToOutOfProcessProxy(
+      const base::FilePath& file_path,
+      ::ppapi::PpapiPermissions permissions,
+      const IPC::ChannelHandle& channel_handle,
+      base::ProcessId plugin_pid,
+      int plugin_child_id);
+
  private:
   friend class PpapiUnittest;
 
   // Class to record document load notifications and play them back once the
   // real document loader becomes available. Used only by NaCl instances.
   class NaClDocumentLoader : public WebKit::WebURLLoaderClient {
    public:
     NaClDocumentLoader();
     virtual ~NaClDocumentLoader();
 
@@ skipping 330 matching lines @@
   v8::Isolate* isolate_;
 
   friend class PpapiPluginInstanceTest;
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_