content/browser/compositor/delegated_frame_host.cc - 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: content/browser/compositor/delegated_frame_host.cc

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

« no previous file with comments | « content/browser/android/system_ui_resource_manager_impl.cc ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/delegated_frame_host.cc

diff --git a/content/browser/compositor/delegated_frame_host.cc b/content/browser/compositor/delegated_frame_host.cc

index f943dd2ded246a9a5493b894aab2a602a4c15656..b468978b9ce9f32bb1b0f9c4763ddbf9167ac00d 100644

--- a/content/browser/compositor/delegated_frame_host.cc

+++ b/content/browser/compositor/delegated_frame_host.cc

@@ -575,10 +575,10 @@

base::Bind(callback, false, SkBitmap()));

scoped_ptr<SkBitmap> bitmap(new SkBitmap);

- if (!bitmap->tryAllocPixels(SkImageInfo::Make(dst_size_in_pixel.width(),

- dst_size_in_pixel.height(),

- color_type,

- kOpaque_SkAlphaType)))

+ if (!bitmap->allocPixels(SkImageInfo::Make(dst_size_in_pixel.width(),

+ dst_size_in_pixel.height(),

+ color_type,

+ kOpaque_SkAlphaType)))

return;

ImageTransportFactory* factory = ImageTransportFactory::GetInstance();

@@ -649,7 +649,7 @@

DCHECK_EQ(scaled_bitmap.colorType(), kN32_SkColorType);

// Paint |scaledBitmap| to alpha-only |grayscale_bitmap|.

SkBitmap grayscale_bitmap;

- bool success = grayscale_bitmap.tryAllocPixels(

+ bool success = grayscale_bitmap.allocPixels(

SkImageInfo::MakeA8(scaled_bitmap.width(), scaled_bitmap.height()));

if (!success) {

callback.Run(false, SkBitmap());