Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index 3ee151f4e5d5c1d36e31be1df8dd7c37eedbcfa6..388117922c2217208d12062dfbd138efa55b4eb5 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -1282,7 +1282,18 @@ void RenderViewImpl::OnSelectWordAroundCaret() { |
| return; |
| input_handler_->set_handling_input_event(true); |
| - webview()->FocusedFrame()->SelectWordAroundCaret(); |
| + int start_adjust = 0; |
| + int end_adjust = 0; |
| + blink::WebRange initial_range = webview()->FocusedFrame()->SelectionRange(); |
|
nasko
2017/05/11 22:21:38
FocusedFrame() can return nullptr, it needs to be
Donn Denman
2017/05/11 23:05:46
Done.
|
| + bool did_select = webview()->FocusedFrame()->SelectWordAroundCaret(); |
| + if (did_select) { |
| + blink::WebRange adjusted_range = |
| + webview()->FocusedFrame()->SelectionRange(); |
|
nasko
2017/05/11 22:21:38
This is the third call to webview()->FocusedFrame(
Donn Denman
2017/05/11 23:05:46
Done.
|
| + start_adjust = adjusted_range.StartOffset() - initial_range.StartOffset(); |
| + end_adjust = adjusted_range.EndOffset() - initial_range.EndOffset(); |
| + } |
| + Send(new ViewHostMsg_SelectWordAroundCaretAck(GetRoutingID(), did_select, |
| + start_adjust, end_adjust)); |
| input_handler_->set_handling_input_event(false); |
| } |