| Index: content/renderer/render_widget.cc
|
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
|
| index c1852580d53261779ba4cb4bdcfdf9b756c4120d..5cb7986a2c98f56a3f7b40c0e90c00551473ef9f 100644
|
| --- a/content/renderer/render_widget.cc
|
| +++ b/content/renderer/render_widget.cc
|
| @@ -1878,12 +1878,12 @@ void RenderWidget::GetCompositionRange(gfx::Range* range) {
|
| if (focused_pepper_plugin_)
|
| return;
|
| #endif
|
| - size_t location, length;
|
| - if (webwidget_->compositionRange(&location, &length)) {
|
| - range->set_start(location);
|
| - range->set_end(location + length);
|
| + WebRange web_range = webwidget_->compositionRange();
|
| + if (!web_range.isNull()) {
|
| + range->set_start(web_range.startOffset());
|
| + range->set_end(web_range.endOffset());
|
| } else {
|
| - WebRange web_range = webwidget_->caretOrSelectionRange();
|
| + web_range = webwidget_->caretOrSelectionRange();
|
| range->set_start(web_range.startOffset());
|
| range->set_end(web_range.endOffset());
|
| }
|
|
|