Index: content/renderer/render_widget.cc |
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc |
index 5d7cf89c45bc219c67a39c01903eee6377c02265..af5e8ead77f1d49e88c7078777be7f6a9e3ffb0d 100644 |
--- a/content/renderer/render_widget.cc |
+++ b/content/renderer/render_widget.cc |
@@ -1305,10 +1305,7 @@ void RenderWidget::UpdateInputMethod() { |
ui::TextInputType new_type = GetTextInputType(); |
bool new_can_compose_inline = CanComposeInline(); |
- WebRect new_caret_bounds; |
- |
- if (webwidget_) |
- new_caret_bounds = webwidget_->caretOrSelectionBounds(); |
+ WebRect new_caret_bounds = GetCaretBounds(); |
// Only sends text input type and caret bounds to the browser process if they |
// are changed. |
@@ -1322,6 +1319,13 @@ void RenderWidget::UpdateInputMethod() { |
} |
} |
+gfx::Rect RenderWidget::GetCaretBounds() { |
+ if (!webwidget_) |
+ return gfx::Rect(); |
+ return webwidget_->caretOrSelectionBounds(); |
+} |
+ |
+// Check WebKit::WebTextInputType and ui::TextInputType is kept in sync. |
COMPILE_ASSERT(int(WebKit::WebTextInputTypeNone) == \ |
int(ui::TEXT_INPUT_TYPE_NONE), mismatching_enums); |
COMPILE_ASSERT(int(WebKit::WebTextInputTypeText) == \ |