Add IPCs/methods for additional IME actions.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 849 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_Cut, OnCut)
     IPC_MESSAGE_HANDLER(ViewMsg_Copy, OnCopy)
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyToFindPboard, OnCopyToFindPboard)
 #endif
     IPC_MESSAGE_HANDLER(ViewMsg_Paste, OnPaste)
     IPC_MESSAGE_HANDLER(ViewMsg_PasteAndMatchStyle, OnPasteAndMatchStyle)
     IPC_MESSAGE_HANDLER(ViewMsg_Replace, OnReplace)
     IPC_MESSAGE_HANDLER(ViewMsg_Delete, OnDelete)
     IPC_MESSAGE_HANDLER(ViewMsg_SelectAll, OnSelectAll)
+    IPC_MESSAGE_HANDLER(ViewMsg_ReplaceAll, OnReplaceAll)
+    IPC_MESSAGE_HANDLER(ViewMsg_Unselect, OnUnselect)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetEditableSelectionOffsets,
+                        OnSetEditableSelectionOffsets)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetComposingRegion,
+                        OnSetComposingRegion)
+    IPC_MESSAGE_HANDLER(ViewMsg_DeleteSurroundingText,
+                        OnDeleteSurroundingText)
     IPC_MESSAGE_HANDLER(ViewMsg_SelectRange, OnSelectRange)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyImageAt, OnCopyImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_ExecuteEditCommand, OnExecuteEditCommand)
     IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind)
     IPC_MESSAGE_HANDLER(ViewMsg_StopFinding, OnStopFinding)
     IPC_MESSAGE_HANDLER(ViewMsg_FindReplyACK, OnFindReplyAck)
     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevel, OnSetZoomLevel)
     IPC_MESSAGE_HANDLER(ViewMsg_ZoomFactor, OnZoomFactor)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingURL,
@@ skipping 393 matching lines @@
 }
 
 void RenderViewImpl::OnSelectAll() {
   if (!webview())
     return;
 
   webview()->focusedFrame()->executeCommand(
       WebString::fromUTF8("SelectAll"));
 }
 
+void RenderViewImpl::OnReplaceAll(const string16& text) {
+  WebKit::WebNode node = GetFocusedNode();
+  if (node.isNull() || !IsEditableNode(node))
+    return;
+
+  OnSelectAll();
+  OnReplace(text);
+}
+
+void RenderViewImpl::OnUnselect() {
+  if (!webview())
+    return;
+
+  webview()->focusedFrame()->executeCommand(WebString::fromUTF8("Unselect"));
+}
+
+void RenderViewImpl::OnSetEditableSelectionOffsets(int start, int end) {
+  webview()->setEditableSelectionOffsets(start, end);
+}
+
+void RenderViewImpl::OnSetComposingRegion(int start, int end,

[bulach, 2012/08/01 20:09:45]

nit: params on the next line

[olilan, 2012/08/21 14:36:15]

Done.

+    const std::vector<WebKit::WebCompositionUnderline>& underlines) {
+  if (!webview() || !webview()->focusedFrame())
+    return;
+  WebKit::WebTextInputInfo info;
+  if (end > start) {
+    // WebCore's Editor does not provide a way to set a composition without
+    // inserting the composing text. So, we select, then save and then delete
+    // the required composing text, then reinsert it as a new composition.
+    info = webview()->textInputInfo();
+    if (info.type == WebKit::WebTextInputTypeNone)
+      return;
+    if (info.compositionStart < info.compositionEnd)
+      webview()->confirmComposition("");
+    webview()->setEditableSelectionOffsets(start, end);
+    WebString text = webview()->focusedFrame()->selectionAsText();
+    webview()->focusedFrame()->executeCommand(WebString::fromUTF8("Delete"));
+    OnImeSetComposition(text, underlines, 0, text.length());
+    // Set the selection back to what it was.
+    webview()->setEditableSelectionOffsets(info.selectionStart,

[rniwa-cr, 2012/08/02 17:11:54]

We should just add a new method to Editor that does all of this.
The way it's currently written is extremely inefficient and potentially error
prone.

[olilan, 2012/08/21 14:36:15]

Replaced by a call to new WebKit method setCompositionFromExistingText.

+                                           info.selectionEnd);
+  } else {
+    // Clear the existing composition.
+    webview()->confirmComposition("");
+  }
+}
+
+void RenderViewImpl::OnDeleteSurroundingText(int before, int after) {
+  if (!webview() || !webview()->focusedFrame())
+    return;
+  for (int i = 0; i < before; ++i)
+    webview()->focusedFrame()->executeCommand(

[darin (slow to review), 2012/08/02 06:25:13]

can't executing this command have side-effects?  for example, suppose the cursor
position changed as a side-effect?  are you sure you don't want to implement
this in a more robust manner?  it seems like you could compute a dom range and
perform a single delete of that, or perhaps webcore has some other primitives
that can help with batch deletion?

i'm not an editing expert, but doesn't this result in a N states being pushed
onto the undo stack?  is that intended?  should the deletions be pushed onto the
undo stack as a single entity instead?  would help to get someone like rniwa@ to
review this too.

[olilan, 2012/08/02 09:55:44]

Yes, agreed this implementation is not ideal. At the least we could select the
range to be deleted and issue a single delete command, unless there's a better
way in WebKit.

rniwa, can you advise?

[rniwa-cr, 2012/08/02 17:11:54]

First off, we should move all of this to Source/WebKit/chromium. We can then use
TextIterator to get a range out of before/after. We can then delete all of
characters in one step.

[olilan, 2012/08/03 15:55:08]

Thanks. One question: is there a way to delete a Range without selecting it
first? From what I understand, DeleteSelectionCommand has much of the code we'd
need to do a delete like this.

[rniwa-cr, 2012/08/03 20:00:07]

There isn't if it needs to be in the undo stack.

[olilan, 2012/08/21 14:36:15]

Implementation replaced by call to new WebKit method ExtendSelectionAndDelete.

+        WebString::fromUTF8("DeleteBackward"));
+  for (int i = 0; i < after; ++i)
+    webview()->focusedFrame()->executeCommand(
+        WebString::fromUTF8("DeleteForward"));
+}
+
 void RenderViewImpl::OnSelectRange(const gfx::Point& start,
                                    const gfx::Point& end) {
   if (!webview())
     return;
 
   handling_select_range_ = true;
   webview()->focusedFrame()->selectRange(start, end);
   handling_select_range_ = false;
 }
 
@@ skipping 4443 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_);
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
 #endif
 }