| 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 339fec9359479b8e4d1c9ffaf578260748595c82..1eb8db8bde8bc462378bf74fb738655182c5169a 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -1348,9 +1348,12 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated(
|
| overscroll_controller_->OnFrameMetadataUpdated(frame_metadata);
|
|
|
| if (selection_controller_) {
|
| + gfx::SizeF view_size(frame_metadata.scrollable_viewport_size);
|
| + view_size.Scale(frame_metadata.page_scale_factor);
|
| selection_controller_->OnSelectionBoundsChanged(
|
| ConvertSelectionBound(frame_metadata.selection_start),
|
| - ConvertSelectionBound(frame_metadata.selection_end));
|
| + ConvertSelectionBound(frame_metadata.selection_end), view_size,
|
| + frame_metadata.location_bar_offset);
|
| }
|
|
|
| // All offsets and sizes are in CSS pixels.
|
| @@ -1668,8 +1671,10 @@ void RenderWidgetHostViewAndroid::OnShowingPastePopup(
|
| selection_controller_->HideAndDisallowShowingAutomatically();
|
| selection_controller_->OnSelectionEditable(true);
|
| selection_controller_->OnSelectionEmpty(true);
|
| + gfx::SizeF size;
|
| + gfx::Vector2dF vec;
|
| selection_controller_->OnSelectionBoundsChanged(insertion_bound,
|
| - insertion_bound);
|
| + insertion_bound, size, vec);
|
| selection_controller_->AllowShowingFromCurrentSelection();
|
| }
|
|
|
|
|