Merge 62820 - Implement IME for Mac plugins using the Cocoa event model on 10...

webkit/glue/plugins/webplugin_delegate_impl.h

Index: webkit/glue/plugins/webplugin_delegate_impl.h
===================================================================
--- webkit/glue/plugins/webplugin_delegate_impl.h	(revision 62862)
+++ webkit/glue/plugins/webplugin_delegate_impl.h	(working copy)
@@ -161,6 +161,8 @@
   // Frames are in screen coordinates.
   void WindowFrameChanged(const gfx::Rect& window_frame,
                           const gfx::Rect& view_frame);
+  // Informs the plugin that IME composition has been confirmed.
+  void ImeCompositionConfirmed(const string16& text);
   // Informs the delegate that the plugin set a Carbon ThemeCursor.
   void SetThemeCursor(ThemeCursor cursor);
   // Informs the delegate that the plugin set a Carbon Cursor.
@@ -385,20 +387,15 @@
   void SetContentAreaOrigin(const gfx::Point& origin);
   // Updates everything that depends on the plugin's absolute screen location.
   void PluginScreenLocationChanged();
+  // Updates anything that depends on plugin visibility.
+  void PluginVisibilityChanged();
 
-  // Returns the apparent zoom ratio for the given event, as inferred from our
-  // current knowledge about about where on screen the plugin is.
-  // This is a temporary workaround for <http://crbug.com/9996>; once that is
-  // fixed we should have correct event coordinates (or an explicit
-  // notification of zoom level).
-  float ApparentEventZoomLevel(const WebKit::WebMouseEvent& event);
+  // Enables/disables IME.
+  void SetImeEnabled(bool enabled);
 
   // Informs the browser about the updated accelerated drawing surface.
   void UpdateAcceleratedSurface();
 
-  // Updates anything that depends on plugin visibility.
-  void PluginVisibilityChanged();
-
   // Uses a CARenderer to draw the plug-in's layer in our OpenGL surface.
   void DrawLayerInSurface();
 
@@ -447,6 +444,8 @@
 
   gfx::Rect cached_clip_rect_;
 
+  bool ime_enabled_;
+
   scoped_ptr<ExternalDragTracker> external_drag_tracker_;
 #endif  // OS_MACOSX