Source/platform/image-decoders/bmp/BMPImageDecoder.h - Issue 1337263003: Revert of Do not consolidate data in BMPImageDecoder

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

Issue 1337263003: Revert of Do not consolidate data in BMPImageDecoder (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@SegmentedBuffer

Patch Set: Rebase Created 5 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 | « Source/platform/image-decoders/FastSharedBufferReader.cpp ('k') | Source/platform/image-decoders/bmp/BMPImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/platform/image-decoders/bmp/BMPImageDecoder.h

diff --git a/Source/platform/image-decoders/bmp/BMPImageDecoder.h b/Source/platform/image-decoders/bmp/BMPImageDecoder.h

index 26efa391718eaa334893e647801afdbd405ec6c4..ceafc393311aab96443700dce2ab9a2353b1c09b 100644

--- a/Source/platform/image-decoders/bmp/BMPImageDecoder.h

+++ b/Source/platform/image-decoders/bmp/BMPImageDecoder.h

@@ -54,6 +54,11 @@ private:

void decodeSize() override { decode(true); }

void decode(size_t) override { decode(false); }

+ inline uint32_t readUint32(int offset) const

+ {

+ return BMPImageReader::readUint32(m_data.get(), m_decodedOffset + offset);

+ }

// Decodes the image. If |onlySize| is true, stops decoding after

// calculating the image size. If decoding fails but there is no more

// data coming, sets the "decode failure" flag.