Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(772)

Unified Diff: webkit/plugins/npapi/webplugin_delegate_impl.h

Issue 6259013: Update Mac plugin IME handling to match updated spec (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to trunk Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/npapi/webplugin.h ('k') | webkit/plugins/npapi/webplugin_delegate_impl_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « webkit/plugins/npapi/webplugin.h ('k') | webkit/plugins/npapi/webplugin_delegate_impl_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698