content/renderer/render_view_impl.cc - Issue 2012823003: Move IME related functions from WebFrame to WebLocalFrame

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: sync Created 4 years, 6 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

« chrome/renderer/spellchecker/spellcheck_provider.cc ('K') | « components/test_runner/text_input_controller.cc ('k') | content/renderer/text_input_client_observer.cc » ('j') | content/renderer/text_input_client_observer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 c2537c9efd172285a2ff5f57cf9d81b2ac4998a3..d921dbfed9ec8dea705a8db0aa139023961ff4f3 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -1626,7 +1626,7 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() {

if (edit_commands_.empty())

return false;

- WebFrame* frame = webview()->focusedFrame();

+ WebLocalFrame* frame = webview()->focusedFrame();

dcheng 2016/06/13 17:29:45 Ditto: why is |frame| null here? I wonder if this

if (!frame)

return false;

@@ -2712,7 +2712,7 @@ 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()) {

+ if (WebLocalFrame* frame = webview()->focusedFrame()) {

dcheng 2016/06/13 17:29:45 I'm not sure this can ever be null. toWebLocalFra

WebRange webrange = WebRange::fromDocumentRange(

frame, replacement_range.start(), replacement_range.length());

if (!webrange.isNull())

@@ -2741,7 +2741,7 @@ 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()) {

+ if (WebLocalFrame* frame = webview()->focusedFrame()) {

dcheng 2016/06/13 17:29:45 Ditto.

WebRange webrange = WebRange::fromDocumentRange(

frame, replacement_range.start(), replacement_range.length());

if (!webrange.isNull())

@@ -2814,7 +2814,7 @@ void RenderViewImpl::GetCompositionCharacterBounds(

if (character_count == 0)

return;

- blink::WebFrame* frame = webview()->focusedFrame();

+ blink::WebLocalFrame* frame = webview()->focusedFrame();

if (!frame)

dcheng 2016/06/13 17:29:45 Similar question: can this actually return null? I

return;