Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(716)

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.cc

Issue 10964059: Cancel composition on mouse clicking. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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: {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698