Moving WM_IME_CHAR handling out of the FocusManager

chrome/views/controls/text_field.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/views/controls/text_field.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlctrls.h>
@@ skipping 55 matching lines @@
   void SetBackgroundColor(COLORREF bg_color);
 
   // CWindowImpl
   BEGIN_MSG_MAP(Edit)
     MSG_WM_CHAR(OnChar)
     MSG_WM_CONTEXTMENU(OnContextMenu)
     MSG_WM_COPY(OnCopy)
     MSG_WM_CREATE(OnCreate)
     MSG_WM_CUT(OnCut)
     MSG_WM_DESTROY(OnDestroy)
+    MESSAGE_HANDLER_EX(WM_IME_CHAR, OnImeChar)
     MESSAGE_HANDLER_EX(WM_IME_STARTCOMPOSITION, OnImeStartComposition)
     MESSAGE_HANDLER_EX(WM_IME_COMPOSITION, OnImeComposition)
     MSG_WM_KEYDOWN(OnKeyDown)
     MSG_WM_LBUTTONDBLCLK(OnLButtonDblClk)
     MSG_WM_LBUTTONDOWN(OnLButtonDown)
     MSG_WM_LBUTTONUP(OnLButtonUp)
     MSG_WM_MBUTTONDOWN(OnNonLButtonDown)
     MSG_WM_MOUSEMOVE(OnMouseMove)
     MSG_WM_MOUSELEAVE(OnMouseLeave)
     MSG_WM_NCCALCSIZE(OnNCCalcSize)
@@ skipping 28 matching lines @@
     DISALLOW_EVIL_CONSTRUCTORS(ScopedFreeze);
   };
 
   // message handlers
   void OnChar(TCHAR key, UINT repeat_count, UINT flags);
   void OnContextMenu(HWND window, const CPoint& point);
   void OnCopy();
   LRESULT OnCreate(CREATESTRUCT* create_struct);
   void OnCut();
   void OnDestroy();
+  LRESULT OnImeChar(UINT message, WPARAM wparam, LPARAM lparam);
   LRESULT OnImeStartComposition(UINT message, WPARAM wparam, LPARAM lparam);
   LRESULT OnImeComposition(UINT message, WPARAM wparam, LPARAM lparam);
   void OnKeyDown(TCHAR key, UINT repeat_count, UINT flags);
   void OnLButtonDblClk(UINT keys, const CPoint& point);
   void OnLButtonDown(UINT keys, const CPoint& point);
   void OnLButtonUp(UINT keys, const CPoint& point);
   void OnMouseLeave();
   void OnMouseMove(UINT keys, const CPoint& point);
   int OnNCCalcSize(BOOL w_param, LPARAM l_param);
   void OnNCPaint(HRGN region);
@@ skipping 298 matching lines @@
 
   // This replace selection will have no effect (even on the undo stack) if the
   // current selection is empty.
   ReplaceSel(L"", true);
 }
 
 void TextField::Edit::OnDestroy() {
   TRACK_HWND_DESTRUCTION(m_hWnd);
 }
 
+LRESULT TextField::Edit::OnImeChar(UINT message, WPARAM wparam, LPARAM lparam) {
+  // http://crbug.com/7707: a rich-edit control may crash when it receives a
+  // WM_IME_CHAR message while it is processing a WM_IME_COMPOSITION message.
+  // Since view controls don't need WM_IME_CHAR messages, we prevent WM_IME_CHAR
+  // messages from being dispatched to view controls via the CallWindowProc()
+  // call.
+  return 0;
+}
+
 LRESULT TextField::Edit::OnImeStartComposition(UINT message,
                                                WPARAM wparam,
                                                LPARAM lparam) {
   // Users may press alt+shift or control+shift keys to change their keyboard
   // layouts. So, we retrieve the input locale identifier everytime we start
   // an IME composition.
   int language_id = PRIMARYLANGID(GetKeyboardLayout(0));
   ime_discard_composition_ =
       language_id == LANG_JAPANESE || language_id == LANG_CHINESE;
   ime_composition_start_ = 0;
@@ skipping 663 matching lines @@
 
   COLORREF bg_color;
   if (!use_default_background_color_)
     bg_color = skia::SkColorToCOLORREF(background_color_);
   else
     bg_color = GetSysColor(read_only_ ? COLOR_3DFACE : COLOR_WINDOW);
   edit_->SetBackgroundColor(bg_color);
 }
 
 }  // namespace views