OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1130 range.set_start(location); | 1130 range.set_start(location); |
1131 range.set_end(location + length); | 1131 range.set_end(location + length); |
1132 } | 1132 } |
1133 Send(new ViewHostMsg_ImeCompositionRangeChanged(routing_id(), range)); | 1133 Send(new ViewHostMsg_ImeCompositionRangeChanged(routing_id(), range)); |
1134 } | 1134 } |
1135 } | 1135 } |
1136 | 1136 |
1137 void RenderWidget::OnImeConfirmComposition( | 1137 void RenderWidget::OnImeConfirmComposition( |
1138 const string16& text, const ui::Range& replacement_range) { | 1138 const string16& text, const ui::Range& replacement_range) { |
1139 if (webwidget_) { | 1139 if (webwidget_) { |
| 1140 handling_input_event_ = true; |
1140 webwidget_->confirmComposition(text); | 1141 webwidget_->confirmComposition(text); |
| 1142 handling_input_event_ = false; |
1141 } | 1143 } |
1142 // Send an updated IME range with just the caret range. | 1144 // Send an updated IME range with just the caret range. |
1143 ui::Range range(ui::Range::InvalidRange()); | 1145 ui::Range range(ui::Range::InvalidRange()); |
1144 size_t location, length; | 1146 size_t location, length; |
1145 if (webwidget_->caretOrSelectionRange(&location, &length)) { | 1147 if (webwidget_->caretOrSelectionRange(&location, &length)) { |
1146 range.set_start(location); | 1148 range.set_start(location); |
1147 range.set_end(location + length); | 1149 range.set_end(location + length); |
1148 } | 1150 } |
1149 Send(new ViewHostMsg_ImeCompositionRangeChanged(routing_id(), range)); | 1151 Send(new ViewHostMsg_ImeCompositionRangeChanged(routing_id(), range)); |
1150 } | 1152 } |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1429 } | 1431 } |
1430 } | 1432 } |
1431 | 1433 |
1432 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { | 1434 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) { |
1433 return false; | 1435 return false; |
1434 } | 1436 } |
1435 | 1437 |
1436 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const { | 1438 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const { |
1437 return false; | 1439 return false; |
1438 } | 1440 } |
OLD | NEW |