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

Unified Diff: content/renderer/render_view_impl.cc

Issue 2012823003: Move IME related functions from WebFrame to WebLocalFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add CHECK in TextInputController::HasMarkedText() Created 4 years, 5 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/text_input_client_observer.cc » ('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 f6b05b6f27cb1ba066c90eaf122c0080cbefff95..b80e70cac98fc2ce95d1827980405eab9086802b 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1661,9 +1661,7 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() {
if (edit_commands_.empty())
return false;
- WebFrame* frame = webview()->focusedFrame();
- if (!frame)
- return false;
+ WebLocalFrame* frame = webview()->focusedFrame();
EditCommands::iterator it = edit_commands_.begin();
EditCommands::iterator end = edit_commands_.end();
@@ -2751,12 +2749,11 @@ void RenderViewImpl::OnImeSetComposition(
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);
- }
+ WebLocalFrame* frame = webview()->focusedFrame();
+ WebRange webrange = WebRange::fromDocumentRange(
+ frame, replacement_range.start(), replacement_range.length());
+ if (!webrange.isNull())
+ frame->selectRange(webrange);
}
RenderWidget::OnImeSetComposition(text,
underlines,
@@ -2780,12 +2777,11 @@ void RenderViewImpl::OnImeConfirmComposition(
if (replacement_range.IsValid() && webview()) {
// Select the text in |replacement_range|, it will then be replaced by
// text added by the call to RenderWidget::OnImeConfirmComposition().
- if (WebLocalFrame* frame = webview()->focusedFrame()->toWebLocalFrame()) {
- WebRange webrange = WebRange::fromDocumentRange(
- frame, replacement_range.start(), replacement_range.length());
- if (!webrange.isNull())
- frame->selectRange(webrange);
- }
+ WebLocalFrame* frame = webview()->focusedFrame();
+ WebRange webrange = WebRange::fromDocumentRange(
+ frame, replacement_range.start(), replacement_range.length());
+ if (!webrange.isNull())
+ frame->selectRange(webrange);
}
RenderWidget::OnImeConfirmComposition(text,
replacement_range,
@@ -2853,9 +2849,7 @@ void RenderViewImpl::GetCompositionCharacterBounds(
if (character_count == 0)
return;
- blink::WebFrame* frame = webview()->focusedFrame();
- if (!frame)
- return;
+ blink::WebLocalFrame* frame = webview()->focusedFrame();
bounds_in_window->reserve(character_count);
blink::WebRect webrect;
« no previous file with comments | « components/test_runner/text_input_controller.cc ('k') | content/renderer/text_input_client_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698