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

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

Issue 3808001: Implement IME for Mac plugins using the Cocoa event model on 10.6 (Closed)
Patch Set: Windows and unit test compile fixes Created 10 years, 2 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/glue/plugins/webplugin.h ('k') | webkit/glue/plugins/webplugin_delegate_impl_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/webplugin_delegate_impl.h
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h
index 55381f9483b07fe5af9a2e65c30fd6589715d203..30a4a5895621e2780620af016a778675cfe0278b 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.h
+++ b/webkit/glue/plugins/webplugin_delegate_impl.h
@@ -161,6 +161,8 @@ class WebPluginDelegateImpl : public webkit_glue::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 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 @@ class WebPluginDelegateImpl : public webkit_glue::WebPluginDelegate {
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 @@ class WebPluginDelegateImpl : public webkit_glue::WebPluginDelegate {
gfx::Rect cached_clip_rect_;
+ bool ime_enabled_;
+
scoped_ptr<ExternalDragTracker> external_drag_tracker_;
#endif // OS_MACOSX
« no previous file with comments | « webkit/glue/plugins/webplugin.h ('k') | webkit/glue/plugins/webplugin_delegate_impl_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698