Update Mac plugin IME handling to match updated spec

webkit/plugins/npapi/webplugin_delegate_impl.h

 // Copyright (c) 2010 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_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 
 #include <string>
 #include <list>
 
@@ skipping 144 matching lines @@
   // Informs the plugin that the window it is in has gained or lost focus.
   void SetWindowHasFocus(bool has_focus);
   // Returns whether or not the window the plugin is in has focus.
   bool GetWindowHasFocus() const { return containing_window_has_focus_; }
   // Informs the plugin that its tab or window has been hidden or shown.
   void SetContainerVisibility(bool is_visible);
   // Informs the plugin that its containing window's frame has changed.
   // 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 plugin that IME composition has completed.
+  // If |text| is empty, IME was cancelled.
+  void ImeCompositionCompleted(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.
   void SetCursor(const Cursor* cursor);
   // Informs the delegate that the plugin set a Cocoa NSCursor.
   void SetNSCursor(NSCursor* cursor);
 
 #ifndef NP_NO_CARBON
   // Indicates that it's time to send the plugin a null event.
   void FireIdleEvent();
@@ skipping 207 matching lines @@
 #elif defined(OS_MACOSX)
   // Sets window_rect_ to |rect|
   void SetPluginRect(const gfx::Rect& rect);
   // Sets content_area_origin to |origin|
   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();
 
-  // Enables/disables IME.
-  void SetImeEnabled(bool enabled);
+  // Starts an IME session.
+  void StartIme();
 
   // Informs the browser about the updated accelerated drawing surface.
   void UpdateAcceleratedSurface();
 
   // Uses a CARenderer to draw the plug-in's layer in our OpenGL surface.
   void DrawLayerInSurface();
 
+  // Returns true if plugin IME is supported.
+  bool IsImeSupported();
+
 #ifndef NP_NO_CARBON
   // Moves our dummy window to match the current screen location of the plugin.
   void UpdateDummyWindowBounds(const gfx::Point& plugin_origin);
 
 #ifndef NP_NO_QUICKDRAW
   // Sets the mode used for QuickDraw plugin drawing. If enabled is true the
   // plugin draws into a GWorld that's not connected to a window (the faster
   // path), otherwise the plugin draws into our invisible dummy window (which is
   // slower, since the call we use to scrape the window contents is much more
   // expensive than copying between GWorlds).
@@ skipping 26 matching lines @@
   gfx::Point content_area_origin_;
 
   bool containing_window_has_focus_;
   bool initial_window_focus_;
   bool container_is_visible_;
   bool have_called_set_window_;
 
   gfx::Rect cached_clip_rect_;
 
   bool ime_enabled_;
+  int keyup_ignore_count_;
 
   scoped_ptr<ExternalDragTracker> external_drag_tracker_;
 #endif  // OS_MACOSX
 
   // Called by the message filter hook when the plugin enters a modal loop.
   void OnModalLoopEntered();
 
   // Returns true if the message passed in corresponds to a user gesture.
   static bool IsUserGesture(const WebKit::WebInputEvent& event);
 
@@ skipping 47 matching lines @@
   // True if NPP_New did not return an error.
   bool creation_succeeded_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl);
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_