summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_widget.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer/render_widget.cc')
-rw-r--r--chrome/renderer/render_widget.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 9d1af7b..eb2b423c 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -734,9 +734,11 @@ void RenderWidget::OnImeSetComposition(WebCompositionCommand command,
return;
ime_control_busy_ = true;
if (!webwidget_->handleCompositionEvent(command, cursor_position,
- target_start, target_end, ime_string)) {
- // If the composition event can't be handled, let the browser process
- // know so it can update it's state.
+ target_start, target_end, ime_string) &&
+ command == WebKit::WebCompositionCommandSet) {
+ // If the composition event can't be handled while we were trying to update
+ // the composition, let the browser process know so it can update it's
+ // state.
Send(new ViewHostMsg_ImeUpdateStatus(routing_id(), IME_CANCEL_COMPOSITION,
WebRect()));
}