Merge lp:~osomon/oxide/non-ime-initiated-text-edit into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Reset the input method and update the surrounding text reported to the keyboard if a non IME initiated edit was performed on the currently focused node.

[lp:~osomon/oxide/non-ime-initiated-text-edit]

1030. By Olivier Tilloy on 2015-07-29

Merge the latest changes from trunk and resolve a conflict.

[Chris Coulson (chrisccoulson)]

Thanks, I've left a comment inline

review: Needs Fixing

Unmerged revisions

1030. By Olivier Tilloy on 2015-07-29

Merge the latest changes from trunk and resolve a conflict.

1029. By Michael Sheldon on 2015-06-15

Update the surrounding text reported to the keyboard when a text field is changed programmatically.

1028. By Olivier Tilloy on 2015-06-15

Merge the latest changes from trunk and resolve a conflict.

1027. By Olivier Tilloy on 2015-05-28

Refresh patch.

1026. By Olivier Tilloy on 2015-05-28

Merge the latest changes from trunk and resolve a few conflicts.

1025. By Olivier Tilloy on 2015-05-18

Merge the latest changes from trunk and resolve a couple of conflicts.

1024. By Olivier Tilloy on 2015-03-30

Reset the input method if a non IME initiated edit was performed on the currently focused node.

1023. By Olivier Tilloy on 2015-03-30

Add a patch to notify of text updates that were not triggered by user input in the focused element (e.g. programatically clearing a text field).

=== added file 'patches/notify-text-updates.patch'
--- patches/notify-text-updates.patch	1970-01-01 00:00:00 +0000
+++ patches/notify-text-updates.patch	2015-07-29 16:58:05 +0000
@@ -0,0 +1,135 @@
+# Description: notify of text updates in the focused element
+#  by activating the Android code in Oxide builds
+# Bug: https://launchpad.net/bugs/1384357
+# Author: Olivier Tilloy <[e-mail]>
+
+diff -r 5e65632068c7 content/common/view_messages.h
+--- a/content/common/view_messages.h	Thu May 28 20:58:31 2015 +0200
++++ b/content/common/view_messages.h	Thu May 28 21:02:38 2015 +0200
+@@ -945,11 +945,13 @@
+                     bool /* animate */)
+ 
+ IPC_MESSAGE_ROUTED0(ViewMsg_ShowImeIfNeeded)
++#endif
+ 
+ // Sent by the browser when an IME update that requires acknowledgement has been
+ // processed on the browser side.
+ IPC_MESSAGE_ROUTED0(ViewMsg_ImeEventAck)
+ 
++#if defined(OS_ANDROID)
+ // Extracts the data at the given rect, returning it through the
+ // ViewHostMsg_SmartClipDataExtracted IPC.
+ IPC_MESSAGE_ROUTED1(ViewMsg_ExtractSmartClipData,
+diff -r 5e65632068c7 content/renderer/render_widget.cc
+--- a/content/renderer/render_widget.cc	Thu May 28 20:58:31 2015 +0200
++++ b/content/renderer/render_widget.cc	Thu May 28 21:02:38 2015 +0200
+@@ -508,9 +508,9 @@
+       device_scale_factor_(screen_info_.deviceScaleFactor),
+       current_event_latency_info_(NULL),
+       next_output_surface_id_(0),
+-#if defined(OS_ANDROID)
+       text_field_is_dirty_(false),
+       outstanding_ime_acks_(0),
++#if defined(OS_ANDROID)
+       body_background_color_(SK_ColorWHITE),
+ #endif
+       popup_origin_scale_for_emulation_(0.f),
+@@ -749,8 +749,8 @@
+     IPC_MESSAGE_HANDLER(ViewMsg_SetSurfaceIdNamespace, OnSetSurfaceIdNamespace)
+ #if defined(OS_ANDROID)
+     IPC_MESSAGE_HANDLER(ViewMsg_ShowImeIfNeeded, OnShowImeIfNeeded)
++#endif
+     IPC_MESSAGE_HANDLER(ViewMsg_ImeEventAck, OnImeEventAck)
+-#endif
+     IPC_MESSAGE_UNHANDLED(handled = false)
+   IPC_END_MESSAGE_MAP()
+   return handled;
+@@ -1768,7 +1768,6 @@
+ #endif
+ }
+ 
+-#if defined(OS_ANDROID)
+ void RenderWidget::IncrementOutstandingImeEventAcks() {
+   ++outstanding_ime_acks_;
+ }
+@@ -1777,10 +1776,9 @@
+   --outstanding_ime_acks_;
+   DCHECK(outstanding_ime_acks_ >= 0);
+ }
+-#endif
+ 
+ bool RenderWidget::ShouldHandleImeEvent() {
+-#if defined(OS_ANDROID)
++#if 1
+   return !!webwidget_ && outstanding_ime_acks_ == 0;
+ #else
+   return !!webwidget_;
+@@ -1976,9 +1974,7 @@
+       (text_input_type_ != new_type ||
+        text_input_info_ != new_info ||
+        can_compose_inline_ != new_can_compose_inline)
+-#if defined(OS_ANDROID)
+       || text_field_is_dirty_
+-#endif
+       ) {
+     ViewHostMsg_TextInputState_Params p;
+     p.type = new_type;
+@@ -1993,13 +1989,11 @@
+ #if defined(USE_AURA)
+     p.is_non_ime_change = true;
+ #endif
+-#if defined(OS_ANDROID)
+     p.is_non_ime_change = (change_source == FROM_NON_IME) ||
+                          text_field_is_dirty_;
+     if (p.is_non_ime_change)
+       IncrementOutstandingImeEventAcks();
+     text_field_is_dirty_ = false;
+-#endif
+ #if defined(USE_AURA)
+     Send(new ViewHostMsg_TextInputTypeChanged(routing_id(),
+                                               new_type,
+@@ -2373,9 +2367,7 @@
+ }
+ 
+ void RenderWidget::didUpdateTextOfFocusedElementByNonUserInput() {
+-#if defined(OS_ANDROID)
+   text_field_is_dirty_ = true;
+-#endif
+ }
+ 
+ bool RenderWidget::HasTouchEventHandlersAt(const gfx::Point& point) const {
+diff -r 5e65632068c7 content/renderer/render_widget.h
+--- a/content/renderer/render_widget.h	Thu May 28 20:58:31 2015 +0200
++++ b/content/renderer/render_widget.h	Thu May 28 21:02:38 2015 +0200
+@@ -444,7 +444,6 @@
+   void OnShowImeIfNeeded();
+   void OnSetSurfaceIdNamespace(uint32_t surface_id_namespace);
+ 
+-#if defined(OS_ANDROID)
+   // Whenever an IME event that needs an acknowledgement is sent to the browser,
+   // the number of outstanding IME events that needs acknowledgement should be
+   // incremented. All IME events will be dropped until we receive an ack from
+@@ -453,7 +452,6 @@
+ 
+   // Called by the browser process for every required IME acknowledgement.
+   void OnImeEventAck();
+-#endif
+ 
+   // Notify the compositor about a change in viewport size. This should be
+   // used only with auto resize mode WebWidgets, as normal WebWidgets should
+@@ -768,7 +766,6 @@
+ 
+   uint32 next_output_surface_id_;
+ 
+-#if defined(OS_ANDROID)
+   // Indicates value in the focused text field is in dirty state, i.e. modified
+   // by script etc., not by user input.
+   bool text_field_is_dirty_;
+@@ -778,6 +775,7 @@
+   // browser. If this value is not 0 IME events will be dropped.
+   int outstanding_ime_acks_;
+ 
++#if defined(OS_ANDROID)
+   // The background color of the document body element. This is used as the
+   // default background color for filling the screen areas for which we don't
+   // have the actual content.
 
=== modified file 'patches/series'
--- patches/series	2015-06-29 11:25:34 +0000
+++ patches/series	2015-07-29 16:58:05 +0000
@@ -34,3 +34,5 @@
 implement-webrtc-get-cpu-features-arm.patch
 enable-optional-neon-for-skia.patch
 add-suggested-filename-to-download-starting-resource-delegate.patch
+notify-text-updates.patch
+update-selection-on-non-ime-text-change.patch
 
=== added file 'patches/update-selection-on-non-ime-text-change.patch'
--- patches/update-selection-on-non-ime-text-change.patch	1970-01-01 00:00:00 +0000
+++ patches/update-selection-on-non-ime-text-change.patch	2015-07-29 16:58:05 +0000
@@ -0,0 +1,20 @@
+# Description: Update the surrounding text reported to the input method
+#  framework when text has been changed programmatically
+# Bug: https://launchpad.net/bugs/1384357
+# Author: Michael Sheldon <[e-mail]>
+diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
+--- a/content/renderer/render_widget.cc
++++ b/content/renderer/render_widget.cc
+@@ -1986,8 +1986,11 @@ void RenderWidget::UpdateTextInputState(
+ #endif
+     p.is_non_ime_change = (change_source == FROM_NON_IME) ||
+                          text_field_is_dirty_;
+-    if (p.is_non_ime_change)
++    if (p.is_non_ime_change) {
+       IncrementOutstandingImeEventAcks();
++      FOR_EACH_OBSERVER(RenderFrameImpl, render_frames_,
++                        didChangeSelection(false));
++    }
+     text_field_is_dirty_ = false;
+ #if defined(USE_AURA)
+     Send(new ViewHostMsg_TextInputTypeChanged(routing_id(),
 
=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2015-07-02 11:22:12 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2015-07-29 16:58:05 +0000
@@ -870,11 +870,15 @@
   client_->EvictCurrentFrame();
 }
 
-void WebView::TextInputStateChanged() {
+void WebView::TextInputStateChanged(bool is_non_ime_change) {
   if (!HasFocus()) {
     return;
   }
 
+  if (is_non_ime_change) {
+    QGuiApplication::inputMethod()->reset();
+  }
+
   if (view_->text_input_type() != ui::TEXT_INPUT_TYPE_NONE) {
     QGuiApplication::inputMethod()->update(
         static_cast<Qt::InputMethodQueries>(Qt::ImQueryInput | Qt::ImHints));
 
=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2015-06-17 17:09:45 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2015-07-29 16:58:05 +0000
@@ -158,7 +158,7 @@
   oxide::FilePicker* CreateFilePicker(content::RenderViewHost* rvh) override;
   void SwapCompositorFrame() override;
   void EvictCurrentFrame() override;
-  void TextInputStateChanged() override;
+  void TextInputStateChanged(bool is_non_ime_change) override;
   void FocusedNodeChanged() override;
   void SelectionBoundsChanged() override;
   void ImeCancelComposition() override;
 
=== modified file 'shared/browser/oxide_render_widget_host_view.cc'
--- shared/browser/oxide_render_widget_host_view.cc	2015-05-28 23:51:39 +0000
+++ shared/browser/oxide_render_widget_host_view.cc	2015-07-29 16:58:05 +0000
@@ -18,6 +18,7 @@
 #include "oxide_render_widget_host_view.h"
 
 #include "base/bind.h"
+#include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
@@ -29,6 +30,7 @@
 #include "cc/quads/render_pass.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
+#include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
@@ -48,6 +50,15 @@
 #include "oxide_renderer_frame_evictor.h"
 #include "oxide_render_widget_host_view_delegate.h"
 
+namespace {
+
+// Sends an acknowledgement to the renderer of a processed IME event.
+void SendImeEventAck(content::RenderWidgetHostImpl* host) {
+  host->Send(new ViewMsg_ImeEventAck(host->GetRoutingID()));
+}
+
+}
+
 namespace oxide {
 
 namespace {
@@ -80,15 +91,23 @@
 
 void RenderWidgetHostView::OnTextInputStateChanged(
     ui::TextInputType type,
-    bool show_ime_if_needed) {
+    bool show_ime_if_needed,
+    bool is_non_ime_change) {
+  base::ScopedClosureRunner ack_caller;
+  if (is_non_ime_change) {
+    ack_caller.Reset(base::Bind(&SendImeEventAck, host_));
+  }
+
   if (type != current_text_input_type_ ||
-      show_ime_if_needed != show_ime_if_needed_) {
+      show_ime_if_needed != show_ime_if_needed_ ||
+      is_non_ime_change) {
     current_text_input_type_ = type;
     show_ime_if_needed_ = show_ime_if_needed;
 
     if (delegate_) {
       delegate_->TextInputStateChanged(current_text_input_type_,
-                                       show_ime_if_needed_);
+                                       show_ime_if_needed_,
+                                       is_non_ime_change);
     }
   }
 }
@@ -661,7 +680,8 @@
 
     UpdateCursorOnWebView();
     delegate_->TextInputStateChanged(current_text_input_type_,
-                                     show_ime_if_needed_);
+                                     show_ime_if_needed_,
+                                     true);
     delegate_->FocusedNodeChanged(focused_node_is_editable_);
     delegate_->SelectionBoundsChanged(caret_rect_,
                                       selection_cursor_position_,
 
=== modified file 'shared/browser/oxide_render_widget_host_view.h'
--- shared/browser/oxide_render_widget_host_view.h	2015-05-27 20:56:59 +0000
+++ shared/browser/oxide_render_widget_host_view.h	2015-07-29 16:58:05 +0000
@@ -93,7 +93,8 @@
  private:
   // content::RenderWidgetHostViewOxide implementation
   void OnTextInputStateChanged(ui::TextInputType type,
-                               bool show_ime_if_needed) final;
+                               bool show_ime_if_needed,
+                               bool is_non_ime_change) final;
   void OnSelectionBoundsChanged(const gfx::Rect& anchor_rect,
                                 const gfx::Rect& focus_rect,
                                 bool is_anchor_first) final;
 
=== modified file 'shared/browser/oxide_render_widget_host_view_delegate.h'
--- shared/browser/oxide_render_widget_host_view_delegate.h	2015-05-14 15:37:57 +0000
+++ shared/browser/oxide_render_widget_host_view_delegate.h	2015-07-29 16:58:05 +0000
@@ -45,7 +45,8 @@
   virtual void UpdateCursor(const content::WebCursor& cursor) = 0;
 
   virtual void TextInputStateChanged(ui::TextInputType type,
-                                     bool show_ime_if_needed) = 0;
+                                     bool show_ime_if_needed,
+                                     bool is_non_ime_change) = 0;
 
   virtual void FocusedNodeChanged(bool is_editable_node) = 0;
 
 
=== modified file 'shared/browser/oxide_web_view.cc'
--- shared/browser/oxide_web_view.cc	2015-07-28 16:16:53 +0000
+++ shared/browser/oxide_web_view.cc	2015-07-29 16:58:05 +0000
@@ -441,16 +441,18 @@
 }
 
 void WebView::TextInputStateChanged(ui::TextInputType type,
-                                    bool show_ime_if_needed) {
+                                    bool show_ime_if_needed,
+                                    bool is_non_ime_change) {
   if (type == text_input_type_ &&
-      show_ime_if_needed == show_ime_if_needed_) {
+      show_ime_if_needed == show_ime_if_needed_ &&
+      !is_non_ime_change) {
     return;
   }
 
   text_input_type_ = type;
   show_ime_if_needed_ = show_ime_if_needed;
 
-  client_->TextInputStateChanged();
+  client_->TextInputStateChanged(is_non_ime_change);
 }
 
 void WebView::FocusedNodeChanged(bool is_editable_node) {
 
=== modified file 'shared/browser/oxide_web_view.h'
--- shared/browser/oxide_web_view.h	2015-07-07 23:18:27 +0000
+++ shared/browser/oxide_web_view.h	2015-07-29 16:58:05 +0000
@@ -389,7 +389,8 @@
   void EvictCurrentFrame() final;
   void UpdateCursor(const content::WebCursor& cursor) final;
   void TextInputStateChanged(ui::TextInputType type,
-                             bool show_ime_if_needed) final;
+                             bool show_ime_if_needed,
+                             bool is_non_ime_change) final;
   void FocusedNodeChanged(bool is_editable_node) final;
   void ImeCancelComposition() final;
   void SelectionBoundsChanged(const gfx::Rect& caret_rect,
 
=== modified file 'shared/browser/oxide_web_view_client.cc'
--- shared/browser/oxide_web_view_client.cc	2015-06-17 17:09:45 +0000
+++ shared/browser/oxide_web_view_client.cc	2015-07-29 16:58:05 +0000
@@ -142,7 +142,7 @@
 
 void WebViewClient::EvictCurrentFrame() {}
 
-void WebViewClient::TextInputStateChanged() {}
+void WebViewClient::TextInputStateChanged(bool is_non_ime_change) {}
 
 void WebViewClient::FocusedNodeChanged() {}
 
 
=== modified file 'shared/browser/oxide_web_view_client.h'
--- shared/browser/oxide_web_view_client.h	2015-06-17 17:09:45 +0000
+++ shared/browser/oxide_web_view_client.h	2015-07-29 16:58:05 +0000
@@ -178,7 +178,7 @@
   //    - The implementations of some of these only touch process-global
   //      stuff - should we have an InputMethod singleton in shared/
   //      rather than dumping it all in WebView?
-  virtual void TextInputStateChanged();
+  virtual void TextInputStateChanged(bool is_non_ime_change);
 
   virtual void FocusedNodeChanged();
 
 
=== modified file 'shared/port/content/browser/render_widget_host_view_oxide.cc'
--- shared/port/content/browser/render_widget_host_view_oxide.cc	2014-10-27 01:38:55 +0000
+++ shared/port/content/browser/render_widget_host_view_oxide.cc	2015-07-29 16:58:05 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2014 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,9 @@
 
 void RenderWidgetHostViewOxide::OnTextInputStateChangedThunk(
     const ViewHostMsg_TextInputState_Params& params) {
-  OnTextInputStateChanged(params.type, params.show_ime_if_needed);
+  OnTextInputStateChanged(params.type,
+                          params.show_ime_if_needed,
+                          params.is_non_ime_change);
 }
 
 void RenderWidgetHostViewOxide::SelectionBoundsChanged(
 
=== modified file 'shared/port/content/browser/render_widget_host_view_oxide.h'
--- shared/port/content/browser/render_widget_host_view_oxide.h	2014-10-27 01:38:55 +0000
+++ shared/port/content/browser/render_widget_host_view_oxide.h	2015-07-29 16:58:05 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2014 Canonical Ltd.
+// Copyright (C) 2013-2015 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -48,7 +48,8 @@
   bool OnMessageReceived(const IPC::Message& msg) final;
 
   virtual void OnTextInputStateChanged(ui::TextInputType type,
-                                       bool show_ime_if_needed) = 0;
+                                       bool show_ime_if_needed,
+                                       bool is_non_ime_change) = 0;
   virtual void OnSelectionBoundsChanged(const gfx::Rect& anchor_rect,
                                         const gfx::Rect& focus_rect,
                                         bool is_anchor_first) = 0;