Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2648)

Unified Diff: content/renderer/render_view_impl.cc

Issue 1635953002: Added replacement_range to ImeSetComposition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: erikchen's review Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 84e6d1af9bb17da005014f5b438e4377adf6c9d2..c7d01832b2b9b434f039a62a7d16bc96375a75c0 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2907,6 +2907,7 @@ void RenderViewImpl::SetFocus(bool enable) {
void RenderViewImpl::OnImeSetComposition(
const base::string16& text,
const std::vector<blink::WebCompositionUnderline>& underlines,
+ const gfx::Range& replacement_range,
int selection_start,
int selection_end) {
#if defined(ENABLE_PLUGINS)
@@ -2942,8 +2943,19 @@ void RenderViewImpl::OnImeSetComposition(
}
#endif // OS_WIN
#endif // ENABLE_PLUGINS
+ if (replacement_range.IsValid() && webview()) {
+ // Select the text in |replacement_range|, it will then be replaced by
+ // text added by the call to RenderWidget::OnImeSetComposition().
+ if (WebLocalFrame* frame = webview()->focusedFrame()->toWebLocalFrame()) {
+ WebRange webrange = WebRange::fromDocumentRange(
+ frame, replacement_range.start(), replacement_range.length());
+ if (!webrange.isNull())
+ frame->selectRange(webrange);
+ }
+ }
RenderWidget::OnImeSetComposition(text,
underlines,
+ replacement_range,
selection_start,
selection_end);
}
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698