<webview>: Plumb edit commands

content/renderer/browser_plugin/browser_plugin.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/browser_plugin/browser_plugin.h"
 
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 1188 matching lines @@
   NPObject* browser_plugin_np_object(bindings_->np_object());
   // The object is expected to be retained before it is returned.
   WebKit::WebBindings::retainObject(browser_plugin_np_object);
   return browser_plugin_np_object;
 }
 
 bool BrowserPlugin::supportsKeyboardFocus() const {
   return true;
 }
 
+bool BrowserPlugin::supportsEditCommands() const {
+  return true;
+}
+
 bool BrowserPlugin::canProcessDrag() const {
   return true;
 }
 
 void BrowserPlugin::paint(WebCanvas* canvas, const WebRect& rect) {
   if (guest_crashed_) {
     if (!sad_guest_)  // Lazily initialize bitmap.
       sad_guest_ = content::GetContentClient()->renderer()->
           GetSadWebViewBitmap();
     // content_shell does not have the sad plugin bitmap, so we'll paint black
@@ skipping 256 matching lines @@
     touch_event.reset(new WebKit::WebTouchEvent());
     memcpy(touch_event.get(), orig_touch_event, sizeof(WebKit::WebTouchEvent));
     if (touch_event->changedTouchesLength > 0) {
       memcpy(&touch_event->touches[touch_event->touchesLength],
              &touch_event->changedTouches,
             touch_event->changedTouchesLength * sizeof(WebKit::WebTouchPoint));
     }
     touch_event->touchesLength += touch_event->changedTouchesLength;
     modified_event = touch_event.get();
   }
+
+  if (WebKit::WebInputEvent::isKeyboardEventType(event.type) &&
+      !edit_commands_.empty()) {
+    browser_plugin_manager()->Send(
+        new BrowserPluginHostMsg_SetEditCommandsForNextKeyEvent(
+            render_view_routing_id_,
+            instance_id_,
+            edit_commands_));
+    edit_commands_.clear();
+  }
+
   browser_plugin_manager()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
                                                 instance_id_,
                                                 plugin_rect_,
                                                 modified_event));
   cursor_.GetCursorInfo(&cursor_info);
   return true;
 }
 
 bool BrowserPlugin::handleDragStatusUpdate(WebKit::WebDragStatus drag_status,
@@ skipping 40 matching lines @@
 bool BrowserPlugin::executeEditCommand(const WebKit::WebString& name) {
   browser_plugin_manager()->Send(new BrowserPluginHostMsg_ExecuteEditCommand(
       render_view_routing_id_,
       instance_id_,
       name.utf8()));
 
   // BrowserPlugin swallows edit commands.
   return true;
 }
 
+bool BrowserPlugin::executeEditCommand(const WebKit::WebString& name,
+                                       const WebKit::WebString& value) {
+  edit_commands_.push_back(EditCommand(name.utf8(), value.utf8()));
+  // BrowserPlugin swallows edit commands.
+  return true;
+}
+
 void BrowserPlugin::OnLockMouseACK(bool succeeded) {
   browser_plugin_manager()->Send(new BrowserPluginHostMsg_LockMouse_ACK(
       render_view_routing_id_,
       instance_id_,
       succeeded));
 }
 
 void BrowserPlugin::OnMouseLockLost() {
   browser_plugin_manager()->Send(new BrowserPluginHostMsg_UnlockMouse_ACK(
       render_view_routing_id_,
       instance_id_));
 }
 
 bool BrowserPlugin::HandleMouseLockedInputEvent(
     const WebKit::WebMouseEvent& event) {
   browser_plugin_manager()->Send(
       new BrowserPluginHostMsg_HandleInputEvent(render_view_routing_id_,
                                                 instance_id_,
                                                 plugin_rect_,
                                                 &event));
   return true;
 }
 
 }  // namespace content