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

chrome/renderer/webplugin_delegate_proxy.cc

 // 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.
 
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 454 matching lines @@
     IPC_MESSAGE_HANDLER(PluginHostMsg_URLRequest, OnHandleURLRequest)
     IPC_MESSAGE_HANDLER(PluginHostMsg_GetCPBrowsingContext,
                         OnGetCPBrowsingContext)
     IPC_MESSAGE_HANDLER(PluginHostMsg_CancelDocumentLoad, OnCancelDocumentLoad)
     IPC_MESSAGE_HANDLER(PluginHostMsg_InitiateHTTPRangeRequest,
                         OnInitiateHTTPRangeRequest)
     IPC_MESSAGE_HANDLER(PluginHostMsg_DeferResourceLoading,
                         OnDeferResourceLoading)
 
 #if defined(OS_MACOSX)
+    IPC_MESSAGE_HANDLER(PluginHostMsg_SetImeEnabled,
+                        OnSetImeEnabled);
     IPC_MESSAGE_HANDLER(PluginHostMsg_BindFakePluginWindowHandle,
                         OnBindFakePluginWindowHandle);
     IPC_MESSAGE_HANDLER(PluginHostMsg_UpdateGeometry_ACK,
                         OnUpdateGeometry_ACK)
     // Used only on 10.6 and later.
     IPC_MESSAGE_HANDLER(PluginHostMsg_AcceleratedSurfaceSetIOSurface,
                         OnAcceleratedSurfaceSetIOSurface)
     // Used on 10.5 and earlier.
     IPC_MESSAGE_HANDLER(PluginHostMsg_AcceleratedSurfaceSetTransportDIB,
                         OnAcceleratedSurfaceSetTransportDIB)
@@ skipping 533 matching lines @@
 void WebPluginDelegateProxy::WindowFrameChanged(gfx::Rect window_frame,
                                                 gfx::Rect view_frame) {
   IPC::Message* msg = new PluginMsg_WindowFrameChanged(instance_id_,
                                                        window_frame,
                                                        view_frame);
   // Make sure frame events are delivered in the right order relative to
   // sync messages they might interact with (e.g., HandleEvent).
   msg->set_unblock(true);
   Send(msg);
 }
+void WebPluginDelegateProxy::ImeCompositionConfirmed(const string16& text,
+                                                     int plugin_id) {
+  // If the text isn't intended for this plugin, there's nothing to do.
+  if (instance_id_ != plugin_id)
+    return;
+
+  IPC::Message* msg = new PluginMsg_ImeCompositionConfirmed(instance_id_,
+                                                            text);
+  // Order relative to other key events is important.
+  msg->set_unblock(true);
+  Send(msg);
+}
 #endif  // OS_MACOSX
 
 void WebPluginDelegateProxy::OnSetWindow(gfx::PluginWindowHandle window) {
   uses_shared_bitmaps_ = !window;
   window_ = window;
   if (plugin_)
     plugin_->SetWindow(window);
 }
 
 void WebPluginDelegateProxy::WillDestroyWindow() {
@@ skipping 328 matching lines @@
   if (!channel_host_)
     return NULL;
 
   ResourceClientProxy* proxy = new ResourceClientProxy(channel_host_,
                                                        instance_id_);
   proxy->InitializeForSeekableStream(resource_id, range_request_id);
   return proxy;
 }
 
 #if defined(OS_MACOSX)
+void WebPluginDelegateProxy::OnSetImeEnabled(bool enabled) {
+  if (render_view_)
+    render_view_->SetPluginImeEnabled(enabled, instance_id_);
+}
+
 void WebPluginDelegateProxy::OnBindFakePluginWindowHandle(bool opaque) {
   BindFakePluginWindowHandle(opaque);
 }
 
 // Synthesize a fake window handle for the plug-in to identify the instance
 // to the browser, allowing mapping to a surface for hardware acceleration
 // of plug-in content. The browser generates the handle which is then set on
 // the plug-in. Returns true if it successfully sets the window handle on the
 // plug-in.
 bool WebPluginDelegateProxy::BindFakePluginWindowHandle(bool opaque) {
@@ skipping 157 matching lines @@
     if (index->mime_type == "application/x-vnd.moveplayer.qm" ||
         index->mime_type == "application/x-vnd.moveplay2.qm" ||
         index->mime_type == "application/x-vnd.movenetworks.qm" ||
         index->mime_type == "application/x-vnd.mnplayer.qm") {
       return true;
     }
   }
   return false;
 }
 #endif