ui/base/dragdrop/drag_utils_win.cc - Issue 1492353002: Consolidate Windows bitmap and DC code

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/dragdrop/drag_utils_win.cc

Issue 1492353002: Consolidate Windows bitmap and DC code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-printing-dc-from-device

Patch Set: remove !_WIN64 restriction on error reporting Created 4 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 side-by-side diff with in-line comments

Download patch

Index: ui/base/dragdrop/drag_utils_win.cc

diff --git a/ui/base/dragdrop/drag_utils_win.cc b/ui/base/dragdrop/drag_utils_win.cc

index 1921338f5a2a28cd35559fc185187dd285f92410..f1862b02fb7af3abab67ab1f6455fed61dbff4b1 100644

--- a/ui/base/dragdrop/drag_utils_win.cc

+++ b/ui/base/dragdrop/drag_utils_win.cc

@@ -11,6 +11,7 @@

#include "base/win/scoped_comptr.h"

#include "base/win/scoped_hdc.h"

+#include "skia/ext/skia_utils_win.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_win.h"

@@ -44,7 +45,7 @@ static void SetDragImageOnDataObject(HBITMAP hbitmap,

static HBITMAP CreateHBITMAPFromSkBitmap(const SkBitmap& sk_bitmap) {

base::win::ScopedGetDC screen_dc(NULL);

BITMAPINFOHEADER header;

- gfx::CreateBitmapHeader(sk_bitmap.width(), sk_bitmap.height(), &header);

+ skia::CreateBitmapHeader(sk_bitmap.width(), sk_bitmap.height(), &header);

void* bits;

HBITMAP bitmap =

CreateDIBSection(screen_dc, reinterpret_cast<BITMAPINFO*>(&header),

« skia/ext/skia_utils_win.cc ('K') | « skia/ext/skia_utils_win.cc ('k') | ui/gfx/gdi_util.h » ('j') | ui/native_theme/native_theme_win.cc » ('J')