Rename Instance_Trusted to Instance_Private, wire it up in Chrome.

webkit/plugins/ppapi/ppapi_plugin_instance.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 WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 10 matching lines @@
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h"
 #include "ui/gfx/rect.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 
 typedef struct NPObject NPObject;
 struct PP_Var;
 struct PPB_Instance;
+struct PPB_Instance_Private;
 struct PPB_Find_Dev;
 struct PPB_Fullscreen_Dev;
 struct PPB_Messaging;
 struct PPB_Zoom_Dev;
 struct PPP_Find_Dev;
 struct PPP_Instance;
+struct PPP_Instance_Private;
 struct PPP_Messaging;
 struct PPP_Pdf;
 struct PPP_Selection_Dev;
 struct PPP_Zoom_Dev;
 
 class SkBitmap;
 class TransportDIB;
 
 namespace gfx {
 class Rect;
@@ skipping 28 matching lines @@
 class PluginInstance : public base::RefCounted<PluginInstance> {
  public:
   PluginInstance(PluginDelegate* delegate,
                  PluginModule* module,
                  const PPP_Instance* instance_interface);
 
   // Delete should be called by the WebPlugin before this destructor.
   ~PluginInstance();
 
   static const PPB_Instance* GetInterface();
+  static const PPB_Instance_Private* GetPrivateInterface();
 
   // Returns a pointer to the interface implementing PPB_Find that is
   // exposed to the plugin.
   static const PPB_Find_Dev* GetFindInterface();
   static const PPB_Fullscreen_Dev* GetFullscreenInterface();
   static const PPB_Messaging* GetMessagingInterface();
   static const PPB_Zoom_Dev* GetZoomInterface();
 
   PluginDelegate* delegate() const { return delegate_; }
   PluginModule* module() const { return module_.get(); }
@@ skipping 38 matching lines @@
   // compositor's namespace. Otherwise return 0. Returns 0 by default.
   virtual unsigned GetBackingTextureId();
 
   // Commit the backing texture to the screen once the side effects some
   // rendering up to an offscreen SwapBuffers are visible.
   void CommitBackingTexture();
 
   // Called when the out-of-process plugin implementing this instance crashed.
   void InstanceCrashed();
 
-  // PPB_Instance implementation.
+  // PPB_Instance and PPB_Instance_Private implementation.
   PP_Var GetWindowObject();
   PP_Var GetOwnerElementObject();
   bool BindGraphics(PP_Resource graphics_id);
   const GURL& plugin_url() const { return plugin_url_; }
   bool full_frame() const { return full_frame_; }
   // If |type| is not PP_CURSORTYPE_CUSTOM, |custom_image| and |hot_spot| are
   // ignored.
   bool SetCursor(PP_CursorType_Dev type,
                  PP_Resource custom_image,
                  const PP_Point* hot_spot);
   PP_Var ExecuteScript(PP_Var script, PP_Var* exception);
 
-  // PPP_Instance pass-through.
+  // PPP_Instance and PPP_Instance_Private pass-through.
   bool Initialize(WebKit::WebPluginContainer* container,
                   const std::vector<std::string>& arg_names,
                   const std::vector<std::string>& arg_values,
                   const GURL& plugin_url,
                   bool full_frame);
   bool HandleDocumentLoad(PPB_URLLoader_Impl* loader);
   bool HandleInputEvent(const WebKit::WebInputEvent& event,
                         WebKit::WebCursorInfo* cursor_info);
   PP_Var GetInstanceObject();
   void ViewChanged(const gfx::Rect& position, const gfx::Rect& clip);
@@ skipping 89 matching lines @@
 
   FullscreenContainer* fullscreen_container() const {
     return fullscreen_container_;
   }
 
  private:
   bool LoadFindInterface();
   bool LoadMessagingInterface();
   bool LoadPdfInterface();
   bool LoadSelectionInterface();
+  bool LoadPrivateInterface();
   bool LoadZoomInterface();
 
   // Determines if we think the plugin has focus, both content area and webkit
   // (see has_webkit_focus_ below).
   bool PluginHasFocus() const;
 
   // Reports the current plugin geometry to the plugin by calling
   // DidChangeView.
   void ReportGeometry();
 
@@ skipping 69 matching lines @@
   bool has_content_area_focus_;
 
   // The id of the current find operation, or -1 if none is in process.
   int find_identifier_;
 
   // The plugin-provided interfaces.
   const PPP_Find_Dev* plugin_find_interface_;
   const PPP_Messaging* plugin_messaging_interface_;
   const PPP_Pdf* plugin_pdf_interface_;
   const PPP_Selection_Dev* plugin_selection_interface_;
+  const PPP_Instance_Private* plugin_private_interface_;
   const PPP_Zoom_Dev* plugin_zoom_interface_;
 
   // A flag to indicate whether we have asked this plugin instance for its
   // messaging interface, so that we can ask only once.
   bool checked_for_plugin_messaging_interface_;
 
   // This is only valid between a successful PrintBegin call and a PrintEnd
   // call.
   PP_PrintSettings_Dev current_print_settings_;
 #if defined(OS_MACOSX)
@@ skipping 52 matching lines @@
   typedef std::map<NPObject*, ObjectVar*> NPObjectToObjectVarMap;
   NPObjectToObjectVarMap np_object_to_object_var_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_