[WIP Approach 2] Straighten up input method reactivation

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 <stddef.h>
 #include <stdint.h>
 
@@ skipping 328 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);
 
+  void CancelComposition();
+  void OnFocusedNodeChanged(bool is_editable, const gfx::Rect& node_bounds);
+
   // Check whether IME thread is being used or not.
   bool IsUsingImeThread();
 
   // Handle start and finish of IME event guard.
   void OnImeEventGuardStart(ImeEventGuard* guard);
   void OnImeEventGuardFinish(ImeEventGuard* guard);
 
   // Returns whether we currently should handle an IME event.
   bool ShouldHandleImeEvent();
 
@@ skipping 141 matching lines @@
   void OnSyntheticGestureCompleted();
   void OnSetTextDirection(blink::WebTextDirection direction);
   void OnGetFPS();
   void OnUpdateScreenRects(const gfx::Rect& view_screen_rect,
                            const gfx::Rect& window_screen_rect);
   void OnUpdateWindowScreenRect(const gfx::Rect& window_screen_rect);
   void OnShowImeIfNeeded();
   void OnSetFrameSinkId(const cc::FrameSinkId& frame_sink_id);
   void OnHandleCompositorProto(const std::vector<uint8_t>& proto);
 
+  void UpdateTextInputStateInternal(ShowIme show_ime,
+                                    ChangeSource change_source,
+                                    bool ignore_until_ack);
 #if defined(OS_ANDROID)
   // Called when we send IME event that expects an ACK.
   void OnImeEventSentForAck(const blink::WebTextInputInfo& info);
 
   // Called by the browser process for every required IME acknowledgement.
   void OnImeEventAck();
 
   // Called by the browser process to update text input state.
   void OnRequestTextInputStateUpdate();
 
@@ skipping 160 matching lines @@
   blink::WebDisplayMode display_mode_;
 
   // It is possible that one ImeEventGuard is nested inside another
   // ImeEventGuard. We keep track of the outermost one, and update it as needed.
   ImeEventGuard* ime_event_guard_;
 
   // Whether IME is in batch edit mode, in which case we do not update text
   // input state.
   bool ime_in_batch_edit_;
 
+  // Indicates that we will ignore IME related messages from host until the
+  // new text input state update is acked by the host.
+  bool ime_ignore_until_acked_;;
+
   // True if we have requested this widget be closed.  No more messages will
   // be sent, except for a Close.
   bool closing_;
 
   // True if it is known that the host is in the process of being shut down.
   bool host_closing_;
 
   // Whether this RenderWidget is currently swapped out, such that the view is
   // being rendered by another process.  If all RenderWidgets in a process are
   // swapped out, the process can exit.
@@ skipping 129 matching lines @@
   // Stores edit commands associated to the next key event.
   // Will be cleared as soon as the next key event is processed.
   EditCommands edit_commands_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_