Do not report selection range as composition range.
Reporting selection range as composition range confuses RWHVM.
This breaks surrounding text retrieval logic in RWHVM.
Looks like the composition range info is only used in Mac and it is
used only when the composition range is not empty. Thus, it does not
make sense to report caret range instead of composition range.
BUG=657170
Review-Url: https://codereview.chromium.org/2485863002
Cr-Commit-Position: refs/heads/master@{#430845}
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index eddf4da..8f6ffdb2 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1869,14 +1869,12 @@
return;
#endif
WebRange web_range = GetWebWidget()->compositionRange();
- if (!web_range.isNull()) {
- range->set_start(web_range.startOffset());
- range->set_end(web_range.endOffset());
- } else {
- web_range = GetWebWidget()->caretOrSelectionRange();
- range->set_start(web_range.startOffset());
- range->set_end(web_range.endOffset());
+ if (web_range.isNull()) {
+ *range = gfx::Range::InvalidRange();
+ return;
}
+ range->set_start(web_range.startOffset());
+ range->set_end(web_range.endOffset());
}
bool RenderWidget::ShouldUpdateCompositionInfo(
