| Index: ui/base/dragdrop/drag_utils_gtk.cc
|
| diff --git a/ui/base/dragdrop/drag_utils_gtk.cc b/ui/base/dragdrop/drag_utils_gtk.cc
|
| index 1cc1773b9a9e3c4d91dc6abc21e78d84a19005aa..59601b40fbad9abcf832872853c434f2d099cd41 100644
|
| --- a/ui/base/dragdrop/drag_utils_gtk.cc
|
| +++ b/ui/base/dragdrop/drag_utils_gtk.cc
|
| @@ -7,25 +7,25 @@
|
| #include <gtk/gtk.h>
|
|
|
| #include "base/logging.h"
|
| -#include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/base/dragdrop/os_exchange_data.h"
|
| #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/gtk_util.h"
|
| +#include "ui/gfx/image/image_skia.h"
|
| #include "ui/gfx/point.h"
|
| #include "ui/gfx/size.h"
|
|
|
| namespace drag_utils {
|
|
|
| -void SetDragImageOnDataObject(const SkBitmap& bitmap,
|
| +void SetDragImageOnDataObject(const gfx::ImageSkia& image_skia,
|
| const gfx::Size& size,
|
| const gfx::Point& cursor_offset,
|
| ui::OSExchangeData* data_object) {
|
| ui::OSExchangeDataProviderGtk& provider(
|
| static_cast<ui::OSExchangeDataProviderGtk&>(data_object->provider()));
|
|
|
| - // Convert the bitmap into a GdkPixbuf.
|
| - GdkPixbuf* canvas_pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
|
| + // Convert the image into a GdkPixbuf.
|
| + GdkPixbuf* canvas_pixbuf = gfx::GdkPixbufFromSkBitmap(image_skia.bitmap());
|
|
|
| // Make a new pixbuf of the requested size and copy it over.
|
| GdkPixbuf* pixbuf = gdk_pixbuf_new(
|
|
|