| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index fadb7038758b35967c7dd1e88c74a52e10b15390..9871606d15b9807a7f939e5b7155ce9318ef9f21 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -1654,9 +1654,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();
|
| @@ -2745,12 +2743,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,
|
| @@ -2774,12 +2771,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,
|
| @@ -2847,9 +2843,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;
|
|
|