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

Unified Diff: content/renderer/render_widget.cc

Issue 2674253004: [refactor] Remove WebWidget::applyReplacementRange (Closed)
Patch Set: Rebased Created 3 years, 10 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 | « components/test_runner/text_input_controller.cc ('k') | content/renderer/render_widget_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 645363b23a98c2597bbdd5e3c0d4e5e6b0d40ea5..5b60ffcca7a62a1e0816ceeef243743d9759d9f6 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -670,7 +670,7 @@ void RenderWidget::SendOrCrash(IPC::Message* message) {
}
bool RenderWidget::ShouldHandleImeEvents() const {
- return GetWebWidget()->isWebFrameWidget() && has_focus_;
+ return GetWebWidget() && GetWebWidget()->isWebFrameWidget() && has_focus_;
}
void RenderWidget::SetWindowRectSynchronously(
@@ -1570,20 +1570,16 @@ void RenderWidget::OnImeSetComposition(
return;
}
#endif
- if (replacement_range.IsValid()) {
- GetWebWidget()->applyReplacementRange(
- WebRange(replacement_range.start(), replacement_range.length()));
- }
-
- if (!GetWebWidget())
- return;
ImeEventGuard guard(this);
blink::WebInputMethodController* controller = GetInputMethodController();
if (!controller ||
!controller->setComposition(
WebString::fromUTF16(text),
- WebVector<WebCompositionUnderline>(underlines), selection_start,
- selection_end)) {
+ WebVector<WebCompositionUnderline>(underlines),
+ replacement_range.IsValid()
+ ? WebRange(replacement_range.start(), replacement_range.length())
+ : WebRange(),
+ selection_start, selection_end)) {
// If we failed to set the composition text, then we need to let the browser
// process to cancel the input method's ongoing composition session, to make
// sure we are in a consistent state.
@@ -1607,19 +1603,16 @@ void RenderWidget::OnImeCommitText(
return;
}
#endif
- if (replacement_range.IsValid()) {
- GetWebWidget()->applyReplacementRange(
- WebRange(replacement_range.start(), replacement_range.length()));
- }
-
- if (!GetWebWidget())
- return;
ImeEventGuard guard(this);
input_handler_->set_handling_input_event(true);
if (auto* controller = GetInputMethodController())
- controller->commitText(WebString::fromUTF16(text),
- WebVector<WebCompositionUnderline>(underlines),
- relative_cursor_pos);
+ controller->commitText(
+ WebString::fromUTF16(text),
+ WebVector<WebCompositionUnderline>(underlines),
+ replacement_range.IsValid()
+ ? WebRange(replacement_range.start(), replacement_range.length())
+ : WebRange(),
+ relative_cursor_pos);
input_handler_->set_handling_input_event(false);
UpdateCompositionInfo(false /* not an immediate request */);
}
« no previous file with comments | « components/test_runner/text_input_controller.cc ('k') | content/renderer/render_widget_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698