| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 9136254fbe5ed2d697e2982dbaaadd6b2ce68e3a..4b695f42c74766be69330b87ce9cb30f0790a950 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -1389,8 +1389,8 @@ void RenderFrameImpl::OnImeConfirmComposition(
|
| char_event.unmodifiedText[i - char_start] = last_text[i];
|
| }
|
|
|
| - if (GetRenderWidget()->webwidget())
|
| - GetRenderWidget()->webwidget()->handleInputEvent(char_event);
|
| + if (GetRenderWidget()->GetWebWidget())
|
| + GetRenderWidget()->GetWebWidget()->handleInputEvent(char_event);
|
| }
|
| } else {
|
| // Mimics the order of events sent by WebKit.
|
| @@ -1817,7 +1817,7 @@ void RenderFrameImpl::OnSelectRange(const gfx::Point& base,
|
|
|
| void RenderFrameImpl::OnAdjustSelectionByCharacterOffset(int start_adjust,
|
| int end_adjust) {
|
| - WebRange range = GetRenderWidget()->webwidget()->caretOrSelectionRange();
|
| + WebRange range = GetRenderWidget()->GetWebWidget()->caretOrSelectionRange();
|
| if (range.isNull())
|
| return;
|
|
|
| @@ -5655,13 +5655,13 @@ void RenderFrameImpl::SyncSelectionIfRequired() {
|
| #endif
|
| {
|
| WebRange selection =
|
| - GetRenderWidget()->webwidget()->caretOrSelectionRange();
|
| + GetRenderWidget()->GetWebWidget()->caretOrSelectionRange();
|
| if (selection.isNull())
|
| return;
|
|
|
| range = gfx::Range(selection.startOffset(), selection.endOffset());
|
|
|
| - if (GetRenderWidget()->webwidget()->textInputType() !=
|
| + if (GetRenderWidget()->GetWebWidget()->textInputType() !=
|
| blink::WebTextInputTypeNone) {
|
| // If current focused element is editable, we will send 100 more chars
|
| // before and after selection. It is for input method surrounding text
|
| @@ -5678,7 +5678,8 @@ void RenderFrameImpl::SyncSelectionIfRequired() {
|
| text = frame_->selectionAsText();
|
| // http://crbug.com/101435
|
| // In some case, frame->selectionAsText() returned text's length is not
|
| - // equal to the length returned from webwidget()->caretOrSelectionRange().
|
| + // equal to the length returned from
|
| + // GetWebWidget()->caretOrSelectionRange().
|
| // So we have to set the range according to text.length().
|
| range.set_end(range.start() + text.length());
|
| }
|
|
|