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

Unified Diff: content/renderer/render_widget.cc

Issue 2674253004: [refactor] Remove WebWidget::applyReplacementRange (Closed)
Patch Set: more refactoring 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
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 32caa60d16d1a89d9474f652401f0334fa74dbe0..f162d01db28fa71d71059a9fe475c135d5eade58 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -668,7 +668,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(
@@ -1555,20 +1555,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.
@@ -1592,19 +1588,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 */);
}

Powered by Google App Engine
This is Rietveld 408576698