| Index: content/browser/android/ime_adapter_android.cc
|
| diff --git a/content/browser/android/ime_adapter_android.cc b/content/browser/android/ime_adapter_android.cc
|
| index bbb0ec982690b34d7d61052a70e15a434d525663..20bf01b95d1b863ed3242737e7e30c03e37e2f4a 100644
|
| --- a/content/browser/android/ime_adapter_android.cc
|
| +++ b/content/browser/android/ime_adapter_android.cc
|
| @@ -293,8 +293,7 @@ void ImeAdapterAndroid::SetEditableSelectionOffsets(
|
| if (!rfh)
|
| return;
|
|
|
| - rfh->Send(new InputMsg_SetEditableSelectionOffsets(rfh->GetRoutingID(), start,
|
| - end));
|
| + rfh->GetFrameInputHandler()->SetEditableSelectionOffsets(start, end);
|
| }
|
|
|
| void ImeAdapterAndroid::SetCharacterBounds(
|
| @@ -328,12 +327,12 @@ void ImeAdapterAndroid::SetComposingRegion(JNIEnv*,
|
| if (!rfh)
|
| return;
|
|
|
| - std::vector<blink::WebCompositionUnderline> underlines;
|
| - underlines.push_back(blink::WebCompositionUnderline(
|
| - 0, end - start, SK_ColorBLACK, false, SK_ColorTRANSPARENT));
|
| + std::vector<ui::CompositionUnderline> underlines;
|
| + underlines.push_back(ui::CompositionUnderline(0, end - start, SK_ColorBLACK,
|
| + false, SK_ColorTRANSPARENT));
|
|
|
| - rfh->Send(new InputMsg_SetCompositionFromExistingText(
|
| - rfh->GetRoutingID(), start, end, underlines));
|
| + rfh->GetFrameInputHandler()->SetCompositionFromExistingText(start, end,
|
| + underlines);
|
| }
|
|
|
| void ImeAdapterAndroid::DeleteSurroundingText(JNIEnv*,
|
| @@ -343,7 +342,7 @@ void ImeAdapterAndroid::DeleteSurroundingText(JNIEnv*,
|
| RenderFrameHostImpl* rfh =
|
| static_cast<RenderFrameHostImpl*>(GetFocusedFrame());
|
| if (rfh)
|
| - rfh->DeleteSurroundingText(before, after);
|
| + rfh->GetFrameInputHandler()->DeleteSurroundingText(before, after);
|
| }
|
|
|
| void ImeAdapterAndroid::DeleteSurroundingTextInCodePoints(
|
| @@ -354,7 +353,8 @@ void ImeAdapterAndroid::DeleteSurroundingTextInCodePoints(
|
| RenderFrameHostImpl* rfh =
|
| static_cast<RenderFrameHostImpl*>(GetFocusedFrame());
|
| if (rfh)
|
| - rfh->DeleteSurroundingTextInCodePoints(before, after);
|
| + rfh->GetFrameInputHandler()->DeleteSurroundingTextInCodePoints(before,
|
| + after);
|
| }
|
|
|
| bool ImeAdapterAndroid::RequestTextInputStateUpdate(
|
|
|