Ensure that size passed into drag_utils_win.cc's SetDragImageOnDataObject function is in pixels and is obtained from the SkBitmap instance.

This is needed for the drag image to show up without being clipped.

Removed the size parameter from the drag_utils::SetDragImageOnDataObject functions as it is not needed. We can get the size from the ImageSkia object as needed.

BUG=381611
R=sky

Review URL: https://codereview.chromium.org/328993002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276725 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 8 deletions

diff --git a/ui/base/dragdrop/drag_utils.h b/ui/base/dragdrop/drag_utils.h
index f035561..48ee94f 100644
--- a/ui/base/dragdrop/drag_utils.h
+++ b/ui/base/dragdrop/drag_utils.h
@@ -34,19 +34,15 @@ UI_BASE_EXPORT void CreateDragImageForFile(const base::FilePath& file_name,
                                            const gfx::ImageSkia& icon,
                                            ui::OSExchangeData* data_object);
 
-// Sets the drag image on data_object from the supplied canvas. width/height
-// are the size of the image to use, and the offsets give the location of
-// the hotspot for the drag image.
+// Sets the drag image on data_object from the supplied canvas.
+// |cursor_offset| gives the location of the hotspot for the drag image.
 UI_BASE_EXPORT void SetDragImageOnDataObject(const gfx::Canvas& canvas,
-                                             const gfx::Size& size,
                                              const gfx::Vector2d& cursor_offset,
                                              ui::OSExchangeData* data_object);
 
-// Sets the drag image on data_object from the supplied ImageSkia. width/height
-// are the size of the image to use, and the offsets give the location of
-// the hotspot for the drag image.
+// Sets the drag image on data_object from the supplied ImageSkia.
+// |cursor_offset| gives the location of the hotspot for the drag image.
 UI_BASE_EXPORT void SetDragImageOnDataObject(const gfx::ImageSkia& image_skia,
-                                             const gfx::Size& size,
                                              const gfx::Vector2d& cursor_offset,
                                              ui::OSExchangeData* data_object);