Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: ui/base/dragdrop/drag_utils_win.cc

Issue 10447053: Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/dragdrop/drag_utils_gtk.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_aura.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/dragdrop/drag_utils.h" 5 #include "ui/base/dragdrop/drag_utils.h"
6 6
7 #include <objidl.h> 7 #include <objidl.h>
8 #include <shlobj.h> 8 #include <shlobj.h>
9 #include <shobjidl.h> 9 #include <shobjidl.h>
10 10
11 #include "base/win/scoped_comptr.h" 11 #include "base/win/scoped_comptr.h"
12 #include "third_party/skia/include/core/SkBitmap.h" 12 #include "third_party/skia/include/core/SkBitmap.h"
13 #include "ui/base/dragdrop/os_exchange_data.h" 13 #include "ui/base/dragdrop/os_exchange_data.h"
14 #include "ui/base/dragdrop/os_exchange_data_provider_win.h" 14 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
15 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
16 #include "ui/gfx/gdi_util.h" 16 #include "ui/gfx/gdi_util.h"
17 #include "ui/gfx/image/image_skia.h"
17 #include "ui/gfx/skbitmap_operations.h" 18 #include "ui/gfx/skbitmap_operations.h"
18 19
19 namespace drag_utils { 20 namespace drag_utils {
20 21
21 static void SetDragImageOnDataObject(HBITMAP hbitmap, 22 static void SetDragImageOnDataObject(HBITMAP hbitmap,
22 const gfx::Size& size, 23 const gfx::Size& size,
23 const gfx::Point& cursor_offset, 24 const gfx::Point& cursor_offset,
24 IDataObject* data_object) { 25 IDataObject* data_object) {
25 base::win::ScopedComPtr<IDragSourceHelper> helper; 26 base::win::ScopedComPtr<IDragSourceHelper> helper;
26 HRESULT rv = CoCreateInstance(CLSID_DragDropHelper, 0, CLSCTX_INPROC_SERVER, 27 HRESULT rv = CoCreateInstance(CLSID_DragDropHelper, 0, CLSCTX_INPROC_SERVER,
(...skipping 19 matching lines...) Expand all
46 CreateDIBSection(screen_dc, reinterpret_cast<BITMAPINFO*>(&header), 47 CreateDIBSection(screen_dc, reinterpret_cast<BITMAPINFO*>(&header),
47 DIB_RGB_COLORS, &bits, NULL, 0); 48 DIB_RGB_COLORS, &bits, NULL, 0);
48 DCHECK(sk_bitmap.rowBytes() == sk_bitmap.width() * 4); 49 DCHECK(sk_bitmap.rowBytes() == sk_bitmap.width() * 4);
49 SkAutoLockPixels lock(sk_bitmap); 50 SkAutoLockPixels lock(sk_bitmap);
50 memcpy( 51 memcpy(
51 bits, sk_bitmap.getPixels(), sk_bitmap.height() * sk_bitmap.rowBytes()); 52 bits, sk_bitmap.getPixels(), sk_bitmap.height() * sk_bitmap.rowBytes());
52 ReleaseDC(NULL, screen_dc); 53 ReleaseDC(NULL, screen_dc);
53 return bitmap; 54 return bitmap;
54 } 55 }
55 56
56 void SetDragImageOnDataObject(const SkBitmap& sk_bitmap, 57 void SetDragImageOnDataObject(const gfx::ImageSkia& image_skia,
57 const gfx::Size& size, 58 const gfx::Size& size,
58 const gfx::Point& cursor_offset, 59 const gfx::Point& cursor_offset,
59 ui::OSExchangeData* data_object) { 60 ui::OSExchangeData* data_object) {
60 DCHECK(data_object && !size.IsEmpty()); 61 DCHECK(data_object && !size.IsEmpty());
61 // InitializeFromBitmap() doesn't expect an alpha channel and is confused 62 // InitializeFromBitmap() doesn't expect an alpha channel and is confused
62 // by premultiplied colors, so unpremultiply the bitmap. 63 // by premultiplied colors, so unpremultiply the bitmap.
63 // SetDragImageOnDataObject(HBITMAP) takes ownership of the bitmap. 64 // SetDragImageOnDataObject(HBITMAP) takes ownership of the bitmap.
64 HBITMAP bitmap = CreateHBITMAPFromSkBitmap( 65 HBITMAP bitmap = CreateHBITMAPFromSkBitmap(
65 SkBitmapOperations::UnPreMultiply(sk_bitmap)); 66 SkBitmapOperations::UnPreMultiply(*image_skia.bitmap()));
66 67
67 // Attach 'bitmap' to the data_object. 68 // Attach 'bitmap' to the data_object.
68 SetDragImageOnDataObject(bitmap, size, cursor_offset, 69 SetDragImageOnDataObject(bitmap, size, cursor_offset,
69 ui::OSExchangeDataProviderWin::GetIDataObject(*data_object)); 70 ui::OSExchangeDataProviderWin::GetIDataObject(*data_object));
70 } 71 }
71 72
72 } // namespace drag_utils 73 } // namespace drag_utils
OLDNEW
« no previous file with comments | « ui/base/dragdrop/drag_utils_gtk.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698