Index: content/browser/renderer_host/render_widget_host_view_win.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h |
index 72eec9b95421da4a8fe5247facd4771d2d211c2c..72ff0c943946675d55b193d7823f7c60d71a95be 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_win.h |
+++ b/content/browser/renderer_host/render_widget_host_view_win.h |
@@ -104,6 +104,7 @@ class RenderWidgetHostViewWin |
MESSAGE_HANDLER(WM_IME_STARTCOMPOSITION, OnImeStartComposition) |
MESSAGE_HANDLER(WM_IME_COMPOSITION, OnImeComposition) |
MESSAGE_HANDLER(WM_IME_ENDCOMPOSITION, OnImeEndComposition) |
+ MESSAGE_HANDLER(WM_IME_REQUEST, OnImeRequest) |
MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseEvent) |
MESSAGE_HANDLER(WM_MOUSELEAVE, OnMouseEvent) |
MESSAGE_HANDLER(WM_LBUTTONDOWN, OnMouseEvent) |
@@ -156,9 +157,13 @@ class RenderWidgetHostViewWin |
virtual void SetIsLoading(bool is_loading) OVERRIDE; |
virtual void TextInputStateChanged(ui::TextInputType type, |
bool can_compose_inline) OVERRIDE; |
+ virtual void SelectionChanged(const string16& text, |
+ size_t offset, |
+ const ui::Range& range) OVERRIDE; |
virtual void SelectionBoundsChanged(const gfx::Rect& start_rect, |
const gfx::Rect& end_rect) OVERRIDE; |
virtual void ImeCancelComposition() OVERRIDE; |
+ virtual void ImeCompositionRangeChanged(const ui::Range& range) OVERRIDE; |
virtual void DidUpdateBackingStore( |
const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, |
const std::vector<gfx::Rect>& copy_rects) OVERRIDE; |
@@ -219,6 +224,8 @@ class RenderWidgetHostViewWin |
UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled); |
LRESULT OnImeEndComposition( |
UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled); |
+ LRESULT OnImeRequest( |
+ UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled); |
LRESULT OnMouseEvent( |
UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled); |
LRESULT OnKeyEvent( |
@@ -300,6 +307,9 @@ class RenderWidgetHostViewWin |
void HandleLockedMouseEvent(UINT message, WPARAM wparam, LPARAM lparam); |
+ LRESULT OnDocumentFeed(RECONVERTSTRING *reconv); |
jam
2011/10/25 00:32:13
nit: RECONVERTSTRING* reconv and below
Peng
2011/10/25 15:51:39
Done.
|
+ LRESULT OnReconvertString(RECONVERTSTRING *reconv); |
+ |
// The associated Model. While |this| is being Destroyed, |
// |render_widget_host_| is NULL and the Windows message loop is run one last |
// time. Message handlers must check for a NULL |render_widget_host_|. |
@@ -407,6 +417,12 @@ class RenderWidgetHostViewWin |
// back, we regard the mouse movement as (0, 0). |
bool ignore_mouse_movement_; |
+ // Stores current selection for IME reconversion. |
+ string16 selection_text_; |
+ size_t selection_text_offset_; |
+ ui::Range selection_range_; |
+ ui::Range composition_range_; |
+ |
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin); |
}; |