Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

Issue 2523943002: Explicitly specify target color space to ImageDecoder at creation (Closed)
Patch Set: Rebase Created 4 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 24 matching lines...) Expand all
35 35
36 namespace blink { 36 namespace blink {
37 37
38 // Number of bits in .BMP used to store the file header (doesn't match 38 // Number of bits in .BMP used to store the file header (doesn't match
39 // "sizeof(BMPImageDecoder::BitmapFileHeader)" since we omit some fields and 39 // "sizeof(BMPImageDecoder::BitmapFileHeader)" since we omit some fields and
40 // don't pack). 40 // don't pack).
41 static const size_t sizeOfFileHeader = 14; 41 static const size_t sizeOfFileHeader = 14;
42 42
43 BMPImageDecoder::BMPImageDecoder(AlphaOption alphaOption, 43 BMPImageDecoder::BMPImageDecoder(AlphaOption alphaOption,
44 ColorSpaceOption colorOptions, 44 ColorSpaceOption colorOptions,
45 sk_sp<SkColorSpace> targetColorSpace,
45 size_t maxDecodedBytes) 46 size_t maxDecodedBytes)
46 : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes), 47 : ImageDecoder(alphaOption,
48 colorOptions,
49 std::move(targetColorSpace),
50 maxDecodedBytes),
47 m_decodedOffset(0) {} 51 m_decodedOffset(0) {}
48 52
49 void BMPImageDecoder::onSetData(SegmentReader* data) { 53 void BMPImageDecoder::onSetData(SegmentReader* data) {
50 if (m_reader) 54 if (m_reader)
51 m_reader->setData(data); 55 m_reader->setData(data);
52 } 56 }
53 57
54 bool BMPImageDecoder::setFailed() { 58 bool BMPImageDecoder::setFailed() {
55 m_reader.reset(); 59 m_reader.reset();
56 return ImageDecoder::setFailed(); 60 return ImageDecoder::setFailed();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 POINTER = 0x5054, // "PT" 119 POINTER = 0x5054, // "PT"
116 COLORICON = 0x4349, // "CI" 120 COLORICON = 0x4349, // "CI"
117 COLORPOINTER = 0x4350, // "CP" 121 COLORPOINTER = 0x4350, // "CP"
118 BITMAPARRAY = 0x4241, // "BA" 122 BITMAPARRAY = 0x4241, // "BA"
119 */ 123 */
120 }; 124 };
121 return (fileType == BMAP) || setFailed(); 125 return (fileType == BMAP) || setFailed();
122 } 126 }
123 127
124 } // namespace blink 128 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698