printing/emf_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: printing/emf_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: printing/emf_win.cc

diff --git a/printing/emf_win.cc b/printing/emf_win.cc

index b2699fdfe4a9df963dfacac9e5f3e00cd195486e..160f0306c6b9ce409cf929c4159de790fefa35bf 100644

--- a/printing/emf_win.cc

+++ b/printing/emf_win.cc

@@ -106,7 +106,7 @@ class RasterBitmap {

::SetGraphicsMode(context_.Get(), GM_ADVANCED);

void* bits = NULL;

gfx::Rect bitmap_rect(raster_size);

- gfx::CreateBitmapHeader(raster_size.width(), raster_size.height(),

+ skia::CreateBitmapHeader(raster_size.width(), raster_size.height(),

&header_.bmiHeader);

bitmap_.reset(CreateDIBSection(context_.Get(), &header_, DIB_RGB_COLORS,

&bits, NULL, 0));

@@ -388,7 +388,7 @@ bool Emf::Record::SafePlayback(Emf::EnumerationContext* context) const {

return false;

}

BITMAPINFOHEADER bmi = {0};

- gfx::CreateBitmapHeader(bitmap->width(), bitmap->height(), &bmi);

+ skia::CreateBitmapHeader(bitmap->width(), bitmap->height(), &bmi);

res = (0 != StretchDIBits(hdc, sdib_record->xDest, sdib_record->yDest,

sdib_record->cxDest,

sdib_record->cyDest, sdib_record->xSrc,

« no previous file with comments | « no previous file | skia/ext/skia_utils_win.h » ('j') | skia/ext/skia_utils_win.cc » ('J')