From a0feffdba660a81392f0e56aa564c58cef58e776 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 11 Jun 2012 18:44:29 +0000 Subject: [PATCH] Merge revision 686 changes: - Mac: Fix the need to press the delete key twice to delete a character after changing the IME language (issue #635). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@687 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser_webview_mac.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcef/browser_webview_mac.mm b/libcef/browser_webview_mac.mm index 0523ea592..62e4a5a4c 100644 --- a/libcef/browser_webview_mac.mm +++ b/libcef/browser_webview_mac.mm @@ -202,10 +202,10 @@ void ExtractUnderlines( // text was deleted or not after handling the key down event. BOOL oldHasMarkedText = hasMarkedText_; - // We check if the marked text has only one character and a delete key is + // We check if the marked text has one or less characters and a delete key is // pressed. In such cases, we want to cancel IME composition and delete the // marked character, so we dispatch the event directly to WebKit. - if (hasMarkedText_ && underlines_.size() == 1) { + if (hasMarkedText_ && underlines_.size() <= 1) { // Check for backspace or delete. if ([theEvent keyCode] == 0x33 || [theEvent keyCode] == 0x75) browser_->UIT_GetWebViewHost()->KeyEvent(theEvent);