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

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

Issue 2727133002: Remove ColorBehavior argument to Image::imageForCurrentFrame (Closed)
Patch Set: Rebase Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
4 * Copyright (C) 2008-2009 Torch Mobile, Inc. 4 * Copyright (C) 2008-2009 Torch Mobile, Inc.
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.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 void resetAnimation() override; 76 void resetAnimation() override;
77 bool maybeAnimated() override; 77 bool maybeAnimated() override;
78 78
79 void setAnimationPolicy(ImageAnimationPolicy policy) override { 79 void setAnimationPolicy(ImageAnimationPolicy policy) override {
80 m_animationPolicy = policy; 80 m_animationPolicy = policy;
81 } 81 }
82 ImageAnimationPolicy animationPolicy() override { return m_animationPolicy; } 82 ImageAnimationPolicy animationPolicy() override { return m_animationPolicy; }
83 void advanceTime(double deltaTimeInSeconds) override; 83 void advanceTime(double deltaTimeInSeconds) override;
84 84
85 sk_sp<SkImage> imageForCurrentFrame(const ColorBehavior&) override; 85 sk_sp<SkImage> imageForCurrentFrame() override;
86 PassRefPtr<Image> imageForDefaultFrame() override; 86 PassRefPtr<Image> imageForDefaultFrame() override;
87 87
88 bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override; 88 bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override;
89 bool currentFrameIsComplete() override; 89 bool currentFrameIsComplete() override;
90 bool currentFrameIsLazyDecoded() override; 90 bool currentFrameIsLazyDecoded() override;
91 91
92 ImageOrientation currentFrameOrientation(); 92 ImageOrientation currentFrameOrientation();
93 93
94 // Construct a BitmapImage with the given orientation. 94 // Construct a BitmapImage with the given orientation.
95 static PassRefPtr<BitmapImage> createWithOrientationForTesting( 95 static PassRefPtr<BitmapImage> createWithOrientationForTesting(
(...skipping 17 matching lines...) Expand all
113 void draw(PaintCanvas*, 113 void draw(PaintCanvas*,
114 const PaintFlags&, 114 const PaintFlags&,
115 const FloatRect& dstRect, 115 const FloatRect& dstRect,
116 const FloatRect& srcRect, 116 const FloatRect& srcRect,
117 RespectImageOrientationEnum, 117 RespectImageOrientationEnum,
118 ImageClampingMode) override; 118 ImageClampingMode) override;
119 119
120 size_t currentFrame() const { return m_currentFrame; } 120 size_t currentFrame() const { return m_currentFrame; }
121 size_t frameCount(); 121 size_t frameCount();
122 122
123 sk_sp<SkImage> frameAtIndex(size_t, const ColorBehavior&); 123 sk_sp<SkImage> frameAtIndex(size_t);
124 124
125 bool frameIsCompleteAtIndex(size_t) const; 125 bool frameIsCompleteAtIndex(size_t) const;
126 float frameDurationAtIndex(size_t) const; 126 float frameDurationAtIndex(size_t) const;
127 bool frameHasAlphaAtIndex(size_t); 127 bool frameHasAlphaAtIndex(size_t);
128 ImageOrientation frameOrientationAtIndex(size_t); 128 ImageOrientation frameOrientationAtIndex(size_t);
129 129
130 sk_sp<SkImage> decodeAndCacheFrame(size_t index, const ColorBehavior&); 130 sk_sp<SkImage> decodeAndCacheFrame(size_t index);
131 void updateSize() const; 131 void updateSize() const;
132 132
133 // Returns the total number of bytes allocated for all framebuffers, i.e. 133 // Returns the total number of bytes allocated for all framebuffers, i.e.
134 // the sum of m_source.frameBytesAtIndex(...) for all frames. 134 // the sum of m_source.frameBytesAtIndex(...) for all frames.
135 size_t totalFrameBytes(); 135 size_t totalFrameBytes();
136 136
137 // Called to wipe out the entire frame buffer cache and tell the image 137 // Called to wipe out the entire frame buffer cache and tell the image
138 // source to destroy everything; this is used when e.g. we want to free 138 // source to destroy everything; this is used when e.g. we want to free
139 // some room in the image cache. 139 // some room in the image cache.
140 void destroyDecodedData() override; 140 void destroyDecodedData() override;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 mutable IntSize m_sizeRespectingOrientation; 184 mutable IntSize m_sizeRespectingOrientation;
185 185
186 size_t m_currentFrame; // The index of the current frame of animation. 186 size_t m_currentFrame; // The index of the current frame of animation.
187 Vector<FrameData, 1> m_frames; // An array of the cached frames of the 187 Vector<FrameData, 1> m_frames; // An array of the cached frames of the
188 // animation. We have to ref frames to pin 188 // animation. We have to ref frames to pin
189 // them in the cache. 189 // them in the cache.
190 190
191 sk_sp<SkImage> 191 sk_sp<SkImage>
192 m_cachedFrame; // A cached copy of the most recently-accessed frame. 192 m_cachedFrame; // A cached copy of the most recently-accessed frame.
193 size_t m_cachedFrameIndex; // Index of the frame that is cached. 193 size_t m_cachedFrameIndex; // Index of the frame that is cached.
194 ColorBehavior m_cachedFrameColorBehavior; // Color behavior that created the
195 // cached frame.
196 194
197 std::unique_ptr<Timer<BitmapImage>> m_frameTimer; 195 std::unique_ptr<Timer<BitmapImage>> m_frameTimer;
198 int m_repetitionCount; // How many total animation loops we should do. This 196 int m_repetitionCount; // How many total animation loops we should do. This
199 // will be cAnimationNone if this image type is 197 // will be cAnimationNone if this image type is
200 // incapable of animation. 198 // incapable of animation.
201 RepetitionCountStatus m_repetitionCountStatus; 199 RepetitionCountStatus m_repetitionCountStatus;
202 int m_repetitionsComplete; // How many repetitions we've finished. 200 int m_repetitionsComplete; // How many repetitions we've finished.
203 double m_desiredFrameStartTime; // The system time at which we hope to see 201 double m_desiredFrameStartTime; // The system time at which we hope to see
204 // the next call to startAnimation(). 202 // the next call to startAnimation().
205 203
(...skipping 11 matching lines...) Expand all
217 bool m_sizeAvailable : 1; // Whether we can obtain the size of the first 215 bool m_sizeAvailable : 1; // Whether we can obtain the size of the first
218 // image frame from ImageIO yet. 216 // image frame from ImageIO yet.
219 mutable bool m_haveFrameCount : 1; 217 mutable bool m_haveFrameCount : 1;
220 }; 218 };
221 219
222 DEFINE_IMAGE_TYPE_CASTS(BitmapImage); 220 DEFINE_IMAGE_TYPE_CASTS(BitmapImage);
223 221
224 } // namespace blink 222 } // namespace blink
225 223
226 #endif 224 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698