diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 16:55:01 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 16:55:01 +0000 |
| commit | a6a6fb32ddfdcbb7f645eb8c9da16538b8d7d285 (patch) | |
| tree | 1259cbfcae741dea94e289bf7eca53d8ed6109de /content | |
| parent | c3329c5d0c08964342008a734cbe76b44e451a97 (diff) | |
| download | chromium_src-a6a6fb32ddfdcbb7f645eb8c9da16538b8d7d285.zip chromium_src-a6a6fb32ddfdcbb7f645eb8c9da16538b8d7d285.tar.gz chromium_src-a6a6fb32ddfdcbb7f645eb8c9da16538b8d7d285.tar.bz2 | |
Cancel composition on mouse clicking.
This behavior is same as desktop existing IMM32 implementation and this change only affects Metro/Chrome.
We can't introduce any tests until http://codereview.chromium.org/10912171 landing.
BUG=151587
TEST=Manually done one metro mode and desktop.
Review URL: https://chromiumcodereview.appspot.com/10964059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_win.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index e850512..1b82608 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -1818,7 +1818,11 @@ LRESULT RenderWidgetHostViewWin::OnMouseEvent(UINT message, WPARAM wparam, case WM_RBUTTONDOWN: // Finish the ongoing composition whenever a mouse click happens. // It matches IE's behavior. - ime_input_.CleanupComposition(m_hWnd); + if (base::win::IsTsfAwareRequired()) { + ui::TsfBridge::GetInstance()->CancelComposition(); + } else { + ime_input_.CleanupComposition(m_hWnd); + } // Fall through. case WM_MOUSEMOVE: case WM_MOUSELEAVE: { |