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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/ImageSource.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) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk> 3 * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk>
4 * Copyright (C) 2008, Google Inc. All rights reserved. 4 * Copyright (C) 2008, Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
15 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 15 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "platform/graphics/ImageSource.h" 28 #include "platform/graphics/ImageSource.h"
29 29
30 #include "platform/RuntimeEnabledFeatures.h"
30 #include "platform/graphics/DeferredImageDecoder.h" 31 #include "platform/graphics/DeferredImageDecoder.h"
31 #include "platform/image-decoders/ImageDecoder.h" 32 #include "platform/image-decoders/ImageDecoder.h"
32 #include "third_party/skia/include/core/SkImage.h" 33 #include "third_party/skia/include/core/SkImage.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 ImageSource::ImageSource() {} 37 ImageSource::ImageSource() {}
37 38
38 ImageSource::~ImageSource() {} 39 ImageSource::~ImageSource() {}
39 40
40 size_t ImageSource::clearCacheExceptFrame(size_t clearExceptFrame) { 41 size_t ImageSource::clearCacheExceptFrame(size_t clearExceptFrame) {
41 return m_decoder ? m_decoder->clearCacheExceptFrame(clearExceptFrame) : 0; 42 return m_decoder ? m_decoder->clearCacheExceptFrame(clearExceptFrame) : 0;
42 } 43 }
43 44
44 PassRefPtr<SharedBuffer> ImageSource::data() { 45 PassRefPtr<SharedBuffer> ImageSource::data() {
45 return m_decoder ? m_decoder->data() : nullptr; 46 return m_decoder ? m_decoder->data() : nullptr;
46 } 47 }
47 48
48 bool ImageSource::setData(PassRefPtr<SharedBuffer> passData, 49 bool ImageSource::setData(PassRefPtr<SharedBuffer> passData,
49 bool allDataReceived) { 50 bool allDataReceived) {
50 RefPtr<SharedBuffer> data = passData; 51 RefPtr<SharedBuffer> data = passData;
51 52
52 if (m_decoder) { 53 if (m_decoder) {
53 m_decoder->setData(data.release(), allDataReceived); 54 m_decoder->setData(data.release(), allDataReceived);
54 // If the decoder is pre-instantiated, it means we've already validated the 55 // If the decoder is pre-instantiated, it means we've already validated the
55 // data/signature at some point. 56 // data/signature at some point.
56 return true; 57 return true;
57 } 58 }
58 59
59 m_decoder = DeferredImageDecoder::create(data, allDataReceived, 60 if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) {
60 ImageDecoder::AlphaPremultiplied, 61 m_decoder = DeferredImageDecoder::create(
61 ImageDecoder::ColorSpaceApplied); 62 data, allDataReceived, ImageDecoder::AlphaPremultiplied,
63 ImageDecoder::ColorSpaceTagged, nullptr);
64 } else {
65 m_decoder = DeferredImageDecoder::create(
66 data, allDataReceived, ImageDecoder::AlphaPremultiplied,
67 ImageDecoder::ColorSpaceTransformed,
68 ImageDecoder::globalTargetColorSpace());
69 }
62 70
63 // Insufficient data is not a failure. 71 // Insufficient data is not a failure.
64 return m_decoder || !ImageDecoder::hasSufficientDataToSniffImageType(*data); 72 return m_decoder || !ImageDecoder::hasSufficientDataToSniffImageType(*data);
65 } 73 }
66 74
67 String ImageSource::filenameExtension() const { 75 String ImageSource::filenameExtension() const {
68 return m_decoder ? m_decoder->filenameExtension() : String(); 76 return m_decoder ? m_decoder->filenameExtension() : String();
69 } 77 }
70 78
71 bool ImageSource::isSizeAvailable() { 79 bool ImageSource::isSizeAvailable() {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 147
140 bool ImageSource::frameIsCompleteAtIndex(size_t index) const { 148 bool ImageSource::frameIsCompleteAtIndex(size_t index) const {
141 return m_decoder && m_decoder->frameIsCompleteAtIndex(index); 149 return m_decoder && m_decoder->frameIsCompleteAtIndex(index);
142 } 150 }
143 151
144 size_t ImageSource::frameBytesAtIndex(size_t index) const { 152 size_t ImageSource::frameBytesAtIndex(size_t index) const {
145 return m_decoder ? m_decoder->frameBytesAtIndex(index) : 0; 153 return m_decoder ? m_decoder->frameBytesAtIndex(index) : 0;
146 } 154 }
147 155
148 } // namespace blink 156 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698