Ensure that the size passed down to the SetDragImageOnDataObject function called from drag_utils::S…

ui/base/dragdrop/drag_utils.cc

Index: ui/base/dragdrop/drag_utils.cc
diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc
index 7be094f95f4972069c77066ee5fc9c0fd09081dd..234079620296d9ee4b58889824b22a9dfb9b853b 100644
--- a/ui/base/dragdrop/drag_utils.cc
+++ b/ui/base/dragdrop/drag_utils.cc
@@ -13,6 +13,7 @@
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "url/gurl.h"
 
@@ -96,11 +97,14 @@ void CreateDragImageForFile(const base::FilePath& file_name,
 }
 
 void SetDragImageOnDataObject(const gfx::Canvas& canvas,
-                              const gfx::Size& size,
+                              const gfx::Size& size_in_dips,
                               const gfx::Vector2d& cursor_offset,
                               ui::OSExchangeData* data_object) {
   gfx::ImageSkia image = gfx::ImageSkia(canvas.ExtractImageRep());
-  SetDragImageOnDataObject(image, size, cursor_offset, data_object);
+  SetDragImageOnDataObject(
+      image,
+      gfx::ToCeiledSize(gfx::ScaleSize(size_in_dips, canvas.image_scale())),

[sky, 2014/06/11 15:57:17]

With few exceptions every where should take dips. If callers aren't calling
SetDragImageOnDataObject with dips, you should change them and not this.

[ananta, 2014/06/11 18:54:03]

As per our discussion removed the size parameter from the
SetDragImageOnDataObject functions and passed down the size from SkBitmap to the
function which needs it.

+      cursor_offset, data_object);
 }
 
 }  // namespace drag_utils