bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 213078.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1339 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-07-24 22:40:07 +00:00
parent a2a3513620
commit d357bb0b80
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/browser/text_input_client_osr_mac.mm
View File

@@ -100,7 +100,7 @@ extern "C" {
ui::Range replacement_range(replacementRange);
renderWidgetHostView_->get_render_widget_host_impl()->ImeConfirmComposition(
base::SysNSStringToUTF16(im_text), replacement_range);
base::SysNSStringToUTF16(im_text), replacement_range, false);
}
// Inserting text will delete all marked text automatically.
@@ -185,7 +185,7 @@ extern "C" {
// called in keyEvent: method.
if (!handlingKeyDown_) {
renderWidgetHostView_->get_render_widget_host_impl()->
ImeConfirmComposition();
ImeConfirmComposition(string16(), ui::Range::InvalidRange(), false);
} else {
unmarkTextCalled_ = YES;
}
@@ -305,7 +305,7 @@ extern "C" {
// text.
if (!hasMarkedText_ && !oldHasMarkedText_ &&
!textToBeInserted_.length() <= 1) {
textToBeInserted_.length() <= 1) {
content::NativeWebKeyboardEvent event(keyEvent);
if (textToBeInserted_.length() == 1) {
event.type = WebKit::WebInputEvent::Type::Char;
@@ -319,7 +319,7 @@ extern "C" {
if (textToBeInserted_.length() >
((hasMarkedText_ || oldHasMarkedText_) ? 0u : 1u)) {
renderWidgetHostView_->get_render_widget_host_impl()->ImeConfirmComposition(
textToBeInserted_);
textToBeInserted_, ui::Range::InvalidRange(), false);
textToBeInserted_ = YES;
}
@@ -336,7 +336,7 @@ extern "C" {
} else if (oldHasMarkedText_ && !hasMarkedText_ && !textInserted) {
if (unmarkTextCalled_) {
renderWidgetHostView_->get_render_widget_host_impl()->
ImeConfirmComposition();
ImeConfirmComposition(string16(), ui::Range::InvalidRange(), false);
} else {
renderWidgetHostView_->get_render_widget_host_impl()->
ImeCancelComposition();