Index: webkit/plugins/npapi/webplugin_delegate_impl.h |
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h |
index 9f64f3a9fec2e9721451f224a255dfc685d43b24..edb319e7cf55b6f3a1149eca620ab921207df5ae 100644 |
--- a/webkit/plugins/npapi/webplugin_delegate_impl.h |
+++ b/webkit/plugins/npapi/webplugin_delegate_impl.h |
@@ -162,8 +162,9 @@ class WebPluginDelegateImpl : public WebPluginDelegate { |
// 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. |
@@ -391,8 +392,8 @@ class WebPluginDelegateImpl : public WebPluginDelegate { |
// 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(); |
@@ -400,6 +401,9 @@ class WebPluginDelegateImpl : public WebPluginDelegate { |
// 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); |
@@ -446,6 +450,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { |
gfx::Rect cached_clip_rect_; |
bool ime_enabled_; |
+ int keyup_ignore_count_; |
scoped_ptr<ExternalDragTracker> external_drag_tracker_; |
#endif // OS_MACOSX |