ui/gfx/icon_util.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/gfx/icon_util.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: fix bad merge Created 4 years, 5 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/gfx/icon_util.cc

diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc

index 8276a20ce99e29261807471b38010b31d33a2cea..1dbf77f6008d92c39aff65b92fa30c575c9dcdcd 100644

--- a/ui/gfx/icon_util.cc

+++ b/ui/gfx/icon_util.cc

@@ -16,8 +16,8 @@

#include "base/win/scoped_handle.h"

#include "base/win/scoped_hdc.h"

#include "skia/ext/image_operations.h"

+#include "skia/ext/skia_utils_win.h"

#include "third_party/skia/include/core/SkBitmap.h"

-#include "ui/gfx/gdi_util.h"

#include "ui/gfx/geometry/size.h"

#include "ui/gfx/image/image.h"

#include "ui/gfx/image/image_family.h"

@@ -320,7 +320,7 @@ base::win::ScopedHICON IconUtil::CreateCursorFromDIB(const gfx::Size& icon_size,

const void* dib_bits,

size_t dib_size) {

BITMAPINFO icon_bitmap_info = {};

- gfx::CreateBitmapHeader(

+ skia::CreateBitmapHeader(

icon_size.width(),

icon_size.height(),

reinterpret_cast<BITMAPINFOHEADER*>(&icon_bitmap_info));

« no previous file with comments | « ui/gfx/gdi_util.cc ('k') | ui/native_theme/native_theme_win.cc » ('j') | no next file with comments »