Fix OSK flickering issue

content/renderer/render_widget.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 226 matching lines @@
   // This mechanism is not a drop-in replacement for IPC: messages sent this way
   // will not be automatically available to BrowserMessageFilter, for example.
   // FIFO ordering is preserved between messages enqueued with the same
   // |policy|, the ordering between messages enqueued for different policies is
   // undefined.
   //
   // |msg| message to send, ownership of |msg| is transferred.
   // |policy| see the comment on MessageDeliveryPolicy.
   void QueueMessage(IPC::Message* msg, MessageDeliveryPolicy policy);
 
-  // Handle common setup/teardown for handling IME events.
-  void StartHandlingImeEvent();
-  void FinishHandlingImeEvent();
+  // Handle start and finish of IME event guard.
+  void OnImeEventGuardStart();
+  void OnImeEventGuardFinish(bool from_non_ime);
 
   // Returns whether we currently should handle an IME event.
   bool ShouldHandleImeEvent();
 
   // Called by the compositor when page scale animation completed.
   virtual void DidCompletePageScaleAnimation() {}
 
   // When paused in debugger, we send ack for mouse event early. This ensures
   // that we continue receiving mouse moves and pass them to debugger. Returns
   // whether we are paused in mouse move event and have sent the ack.
@@ skipping 394 matching lines @@
 
   // Are we currently handling an input event?
   bool handling_input_event_;
 
   // Used to intercept overscroll notifications while an event is being
   // handled. If the event causes overscroll, the overscroll metadata can be
   // bundled in the event ack, saving an IPC.  Note that we must continue
   // supporting overscroll IPC notifications due to fling animation updates.
   scoped_ptr<DidOverscrollParams>* handling_event_overscroll_;
 
-  // Are we currently handling an ime event?
-  bool handling_ime_event_;
+  // The number of IME events we are handling now.
+  int ime_guard_count_;
+  // We intentionally ignore text input update while we are handling IME events,
+  // but show_ime should be effective even if it was set in the middle of
+  // ignored state updates.
+  bool pending_show_ime_if_needed_;
 
   // Type of the input event we are currently handling.
   blink::WebInputEvent::Type handling_event_type_;
 
   // Whether we should not send ack for the current mouse move.
   bool ignore_ack_for_mouse_move_from_debugger_;
 
   // True if we have requested this widget be closed.  No more messages will
   // be sent, except for a Close.
   bool closing_;
@@ skipping 76 matching lines @@
   std::queue<SyntheticGestureCompletionCallback>
       pending_synthetic_gesture_callbacks_;
 
   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_;
 
+  // AdapterInputConnection make real changes only when it's not originating
+  // from IME. We want non-keyboard events (e.g., long-press events) to be
+  // treated as NOT originating from IME, when we finish handling these events.
+  bool pending_update_from_non_ime_;
+
   // Stores the history of text input infos from the last ACK'ed one from the
   // current one. The size is the number of pending ACKs plus one, since we
   // intentionally keep the last ack'd value to know what the browser is
   // currently aware of.
   std::deque<blink::WebTextInputInfo> text_input_info_history_;
 #endif
 
   scoped_ptr<ScreenMetricsEmulator> screen_metrics_emulator_;
 
   // Popups may be displaced when screen metrics emulation is enabled.
@@ skipping 23 matching lines @@
 
   scoped_ptr<scheduler::RenderWidgetSchedulingState>
       render_widget_scheduling_state_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_