Move text input API to Instance.

webkit/plugins/ppapi/ppapi_plugin_instance.h

Index: webkit/plugins/ppapi/ppapi_plugin_instance.h
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index 0231d946e879748c7623f7b60694aaa6f86e15dc..82770dfb3304ac4dbaad57691f1e4b8d56644e44 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -180,14 +180,6 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   bool HandleCompositionEnd(const string16& text);
   bool HandleTextInput(const string16& text);
 
-  // Implementation of composition API.
-  void UpdateCaretPosition(const gfx::Rect& caret,
-                           const gfx::Rect& bounding_box);
-  void SetTextInputType(ui::TextInputType type);
-  void SelectionChanged();
-  void UpdateSurroundingText(const std::string& text,
-                             size_t caret, size_t anchor);
-
   // Gets the current text input status.
   ui::TextInputType text_input_type() const { return text_input_type_; }
   gfx::Rect GetCaretBounds() const;
@@ -377,11 +369,22 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE;
   virtual PP_Bool SetCursor(PP_Instance instance,
                             PP_MouseCursor_Type type,
-                            PP_Resource image,
-                            const PP_Point* hot_spot) OVERRIDE;
+                            PP_Resource image,
+                            const PP_Point* hot_spot) OVERRIDE;
   virtual int32_t LockMouse(PP_Instance instance,
                             PP_CompletionCallback callback) OVERRIDE;
   virtual void UnlockMouse(PP_Instance instance) OVERRIDE;
+  virtual void SetTextInputType(PP_Instance instance,
+                                PP_TextInput_Type type) OVERRIDE;
+  virtual void UpdateCaretPosition(PP_Instance instance,
+                                   const PP_Rect& caret,
+                                   const PP_Rect& bounding_box) OVERRIDE;
+  virtual void CancelCompositionText(PP_Instance instance) OVERRIDE;
+  virtual void SelectionChanged(PP_Instance instance) OVERRIDE;
+  virtual void UpdateSurroundingText(PP_Instance instance,
+                                     const char* text,
+                                     uint32_t caret,
+                                     uint32_t anchor) OVERRIDE;
   virtual PP_Var ResolveRelativeToDocument(
       PP_Instance instance,
       PP_Var relative,