| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| index 5d56ec10e8005ee90c648ba4baa2129583176a8c..eab2101b4e3f89ab1928657d62dbe1c5a7ec294d 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -1232,8 +1232,8 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated(
|
| selection_controller_->OnSelectionEmpty(
|
| frame_metadata.selection.is_empty_text_form_control);
|
| selection_controller_->OnSelectionBoundsChanged(
|
| - frame_metadata.selection.start, frame_metadata.selection.end);
|
| -
|
| + frame_metadata.selection.start, frame_metadata.selection.end,
|
| + frame_metadata.selection.is_handle_visible);
|
| // Set parameters for adaptive handle orientation.
|
| gfx::SizeF viewport_size(frame_metadata.scrollable_viewport_size);
|
| viewport_size.Scale(frame_metadata.page_scale_factor);
|
| @@ -1637,8 +1637,8 @@ void RenderWidgetHostViewAndroid::OnShowingPastePopup(
|
| selection_controller_->OnSelectionEditable(true);
|
| selection_controller_->OnSelectionEmpty(true);
|
| selection_controller_->OnSelectionBoundsChanged(insertion_bound,
|
| - insertion_bound);
|
| - selection_controller_->AllowShowingFromCurrentSelection();
|
| + insertion_bound,
|
| + true);
|
| }
|
|
|
| SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
|
| @@ -1934,8 +1934,6 @@ void RenderWidgetHostViewAndroid::OnStylusSelectUpdate(float x, float y) {
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::OnStylusSelectEnd() {
|
| - if (selection_controller_)
|
| - selection_controller_->AllowShowingFromCurrentSelection();
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::OnStylusSelectTap(base::TimeTicks time,
|
|
|