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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/ImageSource.h

Issue 2556973002: Allow specifying ColorBehavior to ImageSource (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) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ImageSource_h 26 #ifndef ImageSource_h
27 #define ImageSource_h 27 #define ImageSource_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/graphics/ColorBehavior.h"
30 #include "platform/graphics/DeferredImageDecoder.h" 31 #include "platform/graphics/DeferredImageDecoder.h"
31 #include "platform/graphics/ImageOrientation.h" 32 #include "platform/graphics/ImageOrientation.h"
32 #include "third_party/skia/include/core/SkRefCnt.h" 33 #include "third_party/skia/include/core/SkRefCnt.h"
33 #include "wtf/Forward.h" 34 #include "wtf/Forward.h"
34 #include "wtf/Noncopyable.h" 35 #include "wtf/Noncopyable.h"
35 #include <memory> 36 #include <memory>
36 37
37 class SkImage; 38 class SkImage;
38 39
39 namespace blink { 40 namespace blink {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 IntSize frameSizeAtIndex( 84 IntSize frameSizeAtIndex(
84 size_t, 85 size_t,
85 RespectImageOrientationEnum = DoNotRespectImageOrientation) const; 86 RespectImageOrientationEnum = DoNotRespectImageOrientation) const;
86 87
87 bool getHotSpot(IntPoint&) const; 88 bool getHotSpot(IntPoint&) const;
88 int repetitionCount(); 89 int repetitionCount();
89 90
90 size_t frameCount() const; 91 size_t frameCount() const;
91 92
92 // Attempts to create the requested frame. 93 // Attempts to create the requested frame.
93 sk_sp<SkImage> createFrameAtIndex(size_t); 94 sk_sp<SkImage> createFrameAtIndex(size_t, const ColorBehavior&);
94 95
95 float frameDurationAtIndex(size_t) const; 96 float frameDurationAtIndex(size_t) const;
96 bool frameHasAlphaAtIndex( 97 bool frameHasAlphaAtIndex(
97 size_t) const; // Whether or not the frame actually used any alpha. 98 size_t) const; // Whether or not the frame actually used any alpha.
98 bool frameIsCompleteAtIndex( 99 bool frameIsCompleteAtIndex(
99 size_t) const; // Whether or not the frame is fully received. 100 size_t) const; // Whether or not the frame is fully received.
100 ImageOrientation orientationAtIndex(size_t) const; // EXIF image orientation 101 ImageOrientation orientationAtIndex(size_t) const; // EXIF image orientation
101 102
102 // Returns the number of bytes in the decoded frame. May return 0 if the 103 // Returns the number of bytes in the decoded frame. May return 0 if the
103 // frame has not yet begun to decode. 104 // frame has not yet begun to decode.
104 size_t frameBytesAtIndex(size_t) const; 105 size_t frameBytesAtIndex(size_t) const;
105 106
106 private: 107 private:
107 std::unique_ptr<DeferredImageDecoder> m_decoder; 108 std::unique_ptr<DeferredImageDecoder> m_decoder;
109 ColorBehavior m_decoderColorBehavior;
110 bool m_allDataReceived = false;
108 }; 111 };
109 112
110 } // namespace blink 113 } // namespace blink
111 114
112 #endif 115 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698