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

Unified Diff: third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp

Issue 2878363003: Revert of Fix ImageAnimation constant names after Blink renaming (Closed)
Patch Set: Created 3 years, 7 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
Index: third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
index 2fdf29e19ba2dbd5df6681985877f3ed1050d320..12e0b2fb8364ec0dc2fda772ca5eee3b80fb3bac 100644
--- a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
@@ -126,7 +126,7 @@
demux_(0),
demux_state_(WEBP_DEMUX_PARSING_HEADER),
have_already_parsed_this_data_(false),
- repetition_count_(kAnimationLoopOnce),
+ repetition_count_(kCAnimationLoopOnce),
decoded_height_(0) {
blend_function_ = (alpha_option == kAlphaPremultiplied)
? alphaBlendPremultiplied
@@ -156,7 +156,7 @@
}
int WEBPImageDecoder::RepetitionCount() const {
- return Failed() ? kAnimationLoopOnce : repetition_count_;
+ return Failed() ? kCAnimationLoopOnce : repetition_count_;
}
bool WEBPImageDecoder::FrameIsCompleteAtIndex(size_t index) const {
@@ -211,7 +211,7 @@
format_flags_ = WebPDemuxGetI(demux_, WEBP_FF_FORMAT_FLAGS);
if (!(format_flags_ & ANIMATION_FLAG)) {
- repetition_count_ = kAnimationNone;
+ repetition_count_ = kCAnimationNone;
} else {
// Since we have parsed at least one frame, even if partially,
// the global animation (ANIM) properties have been read since
@@ -220,7 +220,7 @@
// Repetition count is always <= 16 bits.
DCHECK_EQ(repetition_count_, repetition_count_ & 0xffff);
if (!repetition_count_)
- repetition_count_ = kAnimationLoopInfinite;
+ repetition_count_ = kCAnimationLoopInfinite;
// FIXME: Implement ICC profile support for animated images.
format_flags_ &= ~ICCP_FLAG;
}

Powered by Google App Engine
This is Rietveld 408576698