Index: content/browser/renderer_host/render_widget_host_view_win.cc |
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 e850512544cf2ca7b15fee62e33676cf691bdf94..1b82608b4c27a29cd71421b8dc49b577f933897e 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: { |