third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.h - Issue 2756463003: Remove opaque alpha channel special case

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: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.h

Issue 2756463003: Remove opaque alpha channel special case (Closed)

Patch Set: Checking if JPEGImageDecoder::OutputScanlines()'s SetHasAlpha(true) is under test Created 3 years, 7 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 | « third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.h

diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.h b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.h

index c5bf44b401205a428dcf0f7e6aa4460a2c2221d1..c88a4dd4667bd137939ae287ea3fceab576c9296 100644

--- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.h

+++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.h

@@ -241,9 +241,11 @@ class PLATFORM_EXPORT BMPImageReader final {

: value;

}

+ inline bool IsAlphaSupported() const { return bit_masks_[3]; }

inline unsigned GetAlpha(uint32_t pixel) const {

- // For images without alpha, return alpha of 0xff.

- return bit_masks_[3] ? GetComponent(pixel, 3) : 0xff;

+ DCHECK(IsAlphaSupported());

+ return GetComponent(pixel, 3);

}

// Sets the current pixel to the color given by |color_index|. This also