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

ui/base/dragdrop/drag_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/dragdrop/drag_utils.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #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"
 
 namespace drag_utils {
 
 namespace {
 
 // Maximum width of the link drag image in pixels.
 static const int kLinkDragImageVPadding = 3;
 
@@ skipping 63 matching lines @@
   gfx::CanvasImageSource* source = new FileDragImageSource(file_name, icon);
   gfx::Size size = source->size();
   // ImageSkia takes ownership of |source|.
   gfx::ImageSkia image = gfx::ImageSkia(source, size);
 
   gfx::Vector2d cursor_offset(size.width() / 2, kLinkDragImageVPadding);
   SetDragImageOnDataObject(image, size, cursor_offset, data_object);
 }
 
 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