[Mac] Implement the system dictionary popup by implementing NSTextInput methods.

chrome/renderer/render_widget.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/render_widget.h"
 
 #include "app/surface/transport_dib.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
+#include "chrome/common/text_input_client_messages.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/renderer_webkitclient_impl.h"
 #include "ipc/ipc_sync_message.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
 #endif  // defined(OS_POSIX)
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h"
 
 using WebKit::WebCompositionUnderline;
 using WebKit::WebCursorInfo;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebPopupMenu;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebPopupType;
+using WebKit::WebRange;
 using WebKit::WebRect;
 using WebKit::WebScreenInfo;
 using WebKit::WebSize;
 using WebKit::WebTextDirection;
 using WebKit::WebTextInputType;
 using WebKit::WebVector;
 using WebKit::WebWidget;
 
 RenderWidget::RenderWidget(RenderThreadBase* render_thread,
                            WebKit::WebPopupType popup_type)
@@ skipping 794 matching lines @@
   // only during the input method attached to the browser process is active.
   input_method_is_active_ = is_active;
 }
 
 void RenderWidget::OnImeSetComposition(
     const string16& text,
     const std::vector<WebCompositionUnderline>& underlines,
     int selection_start, int selection_end) {
   if (!webwidget_)
     return;
-  if (!webwidget_->setComposition(
+  if (webwidget_->setComposition(
       text, WebVector<WebCompositionUnderline>(underlines),
       selection_start, selection_end)) {
+    // Setting the IME composition was successful. Send the new composition
+    // range to the browser.
+    WebRange range = webwidget_->compositionRange();
+    if (range.isNull()) {
+      // The IME was cancelled via the Esc key, so just send back the caret.
+      range = webwidget_->caretOrSelectionRange();
+    }
+    Send(new TextInputClientViewHostMsg_ImeCompositionRangeChanged(routing_id(),
+        range.startOffset(), range.endOffset()));
+  } else {
     // If we failed to set the composition text, then we need to let the browser
     // process to cancel the input method's ongoing composition session, to make
     // sure we are in a consistent state.
     Send(new ViewHostMsg_ImeCancelComposition(routing_id()));
+    // Send an updated IME range with just the caret range.
+    WebRange range = webwidget_->caretOrSelectionRange();
+    Send(new TextInputClientViewHostMsg_ImeCompositionRangeChanged(routing_id(),
+        range.startOffset(), range.endOffset()));

[James Su, 2011/02/17 02:03:00]

We need this code in RenderWidget::resetInputMethod() as well.

[Robert Sesek, 2011/02/17 20:05:04]

Done.

   }
 }
 
 void RenderWidget::OnImeConfirmComposition(const string16& text) {
   if (webwidget_)
     webwidget_->confirmComposition(text);
+  // Send an updated IME range with just the caret range.
+  WebRange range = webwidget_->caretOrSelectionRange();
+  Send(new TextInputClientViewHostMsg_ImeCompositionRangeChanged(routing_id(),
+      range.startOffset(), range.endOffset()));
 }
 
 // This message causes the renderer to render an image of the
 // desired_size, regardless of whether the tab is hidden or not.
 void RenderWidget::OnMsgPaintAtSize(const TransportDIB::Handle& dib_handle,
                                     int tag,
                                     const gfx::Size& page_size,
                                     const gfx::Size& desired_size) {
   if (!webwidget_ || !TransportDIB::is_valid(dib_handle)) {
     if (TransportDIB::is_valid(dib_handle)) {
@@ skipping 200 matching lines @@
 
 void RenderWidget::CleanupWindowInPluginMoves(gfx::PluginWindowHandle window) {
   for (WebPluginGeometryVector::iterator i = plugin_window_moves_.begin();
        i != plugin_window_moves_.end(); ++i) {
     if (i->window == window) {
       plugin_window_moves_.erase(i);
       break;
     }
   }
 }