Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 8c5023f806cd73411ad1dc97b76bd0819d5cc373..b06d90ae3fab23cdaaea762d01c3d96b2c1aa716 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -2233,8 +2233,8 @@ void RenderViewImpl::showContextMenu( |
start_rect.bottom()); |
gfx::Point end_point(end_rect.right(), |
end_rect.bottom()); |
- params.selection_start = GetScrollOffset().Add(start_point); |
- params.selection_end = GetScrollOffset().Add(end_point); |
+ params.selection_start = start_point.Add(GetScrollOffset()); |
+ params.selection_end = end_point.Add(GetScrollOffset()); |
#endif |
Send(new ViewHostMsg_ContextMenu(routing_id_, params)); |
@@ -2304,9 +2304,10 @@ void RenderViewImpl::startDragging(WebFrame* frame, |
const WebDragData& data, |
WebDragOperationsMask mask, |
const WebImage& image, |
- const WebPoint& imageOffset) { |
+ const WebPoint& webImageOffset) { |
WebDropData drop_data(data); |
drop_data.referrer_policy = frame->document().referrerPolicy(); |
+ gfx::Vector2d imageOffset(gfx::Point(webImageOffset).DistanceFromOrigin()); |
Send(new DragHostMsg_StartDragging(routing_id_, |
drop_data, |
mask, |
@@ -5623,9 +5624,9 @@ webkit::ppapi::PluginInstance* RenderViewImpl::GetBitmapForOptimizedPluginPaint( |
paint_bounds, dib, location, clip, scale_factor); |
} |
-gfx::Point RenderViewImpl::GetScrollOffset() { |
+gfx::Vector2d RenderViewImpl::GetScrollOffset() { |
WebSize scroll_offset = webview()->mainFrame()->scrollOffset(); |
- return gfx::Point(scroll_offset.width, scroll_offset.height); |
+ return gfx::Vector2d(scroll_offset.width, scroll_offset.height); |
} |
void RenderViewImpl::OnClearFocusedNode() { |