Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2603)

Unified Diff: content/renderer/render_widget.cc

Issue 29943002: Limit display of the virtual keyboard to state changes triggered from a user gesture. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit tests for input methods on Windows. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index a64b6184fca82289a2db2d5a25d880a19e28ee4c..6d67b70a2459ad09bcbe373b9b6675813c026f31 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1195,6 +1195,12 @@ void RenderWidget::OnHandleInputEvent(const blink::WebInputEvent* input_event,
// of a processed touch end event.
if (input_event->type == WebInputEvent::TouchEnd && processed)
UpdateTextInputState(true, true);
+#elif defined(USE_AURA)
+ // Show the virtual keyboard if enabled and a user gesture triggers a focus
+ // change.
+ if (processed && (input_event->type == WebInputEvent::TouchEnd ||
+ input_event->type == WebInputEvent::MouseUp))
+ UpdateTextInputState(true, false);
#endif
handling_input_event_ = false;
@@ -2497,7 +2503,7 @@ void RenderWidget::UpdateTextInputType() {
}
}
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(USE_AURA)
void RenderWidget::UpdateTextInputState(bool show_ime_if_needed,
bool send_ime_ack) {
if (handling_ime_event_)
@@ -2528,9 +2534,13 @@ void RenderWidget::UpdateTextInputState(bool show_ime_if_needed,
p.composition_end = new_info.compositionEnd;
p.can_compose_inline = new_can_compose_inline;
p.show_ime_if_needed = show_ime_if_needed;
+#if defined(OS_ANDROID)
p.require_ack = send_ime_ack;
if (p.require_ack)
IncrementOutstandingImeEventAcks();
+#else
+ p.require_ack = false;
+#endif
Shu Chen 2014/01/09 04:21:17 This change is unnecessary if pass send_ime_ack co
kevers 2014/01/09 15:29:09 IncrementOutstandingImeEventAcks is Android only.
Send(new ViewHostMsg_TextInputStateChanged(routing_id(), p));
text_input_info_ = new_info;
@@ -2706,7 +2716,7 @@ void RenderWidget::resetInputMethod() {
void RenderWidget::didHandleGestureEvent(
const WebGestureEvent& event,
bool event_cancelled) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(USE_AURA)
if (event_cancelled)
return;
if (event.type == WebInputEvent::GestureTap ||

Powered by Google App Engine
This is Rietveld 408576698