skia/ext/skia_utils_mac.mm - Issue 556463002: Revert of tryAllocPixels returns bool, allocPixels requires success

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: skia/ext/skia_utils_mac.mm

Issue 556463002: Revert of tryAllocPixels returns bool, allocPixels requires success (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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: skia/ext/skia_utils_mac.mm

diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm

index f050ac9bd92c61cff5c190219ed43427d2aa0dad..d6b604169f0238c727af4784e80fadfe543df447 100644

--- a/skia/ext/skia_utils_mac.mm

+++ b/skia/ext/skia_utils_mac.mm

@@ -27,7 +27,7 @@

DCHECK((image != 0) ^ (image_rep != 0));

SkBitmap bitmap;

- if (!bitmap.tryAllocN32Pixels(size.width, size.height, is_opaque))

+ if (!bitmap.allocN32Pixels(size.width, size.height, is_opaque))

return bitmap; // Return |bitmap| which should respond true to isNull().

@@ -430,7 +430,7 @@

return 0;

bitmap_.lockPixels();

} else {

- bool result = bitmap_.tryAllocN32Pixels(

+ bool result = bitmap_.allocN32Pixels(

clip_bounds.width(), clip_bounds.height());

DCHECK(result);

if (!result)

« no previous file with comments | « skia/ext/skia_utils_ios.mm ('k') | ui/gfx/android/java_bitmap.cc » ('j') | no next file with comments »