Revert of Fix ImageAnimation constant names after Blink renaming

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

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 108 matching lines @@
 WEBPImageDecoder::WEBPImageDecoder(AlphaOption alpha_option,
                                    const ColorBehavior& color_behavior,
                                    size_t max_decoded_bytes)
     : ImageDecoder(alpha_option, color_behavior, max_decoded_bytes),
       decoder_(0),
       format_flags_(0),
       frame_background_has_alpha_(false),
       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
                         : alphaBlendNonPremultiplied;
 }
 
 WEBPImageDecoder::~WEBPImageDecoder() {
   Clear();
 }
 
 void WEBPImageDecoder::Clear() {
   WebPDemuxDelete(demux_);
   demux_ = 0;
   consolidated_data_.reset();
   ClearDecoder();
 }
 
 void WEBPImageDecoder::ClearDecoder() {
   WebPIDelete(decoder_);
   decoder_ = 0;
   decoded_height_ = 0;
   frame_background_has_alpha_ = false;
 }
 
 void WEBPImageDecoder::OnSetData(SegmentReader*) {
   have_already_parsed_this_data_ = false;
 }
 
 int WEBPImageDecoder::RepetitionCount() const {
-  return Failed() ? kAnimationLoopOnce : repetition_count_;
+  return Failed() ? kCAnimationLoopOnce : repetition_count_;
 }
 
 bool WEBPImageDecoder::FrameIsCompleteAtIndex(size_t index) const {
   if (!demux_ || demux_state_ <= WEBP_DEMUX_PARSING_HEADER)
     return false;
   if (!(format_flags_ & ANIMATION_FLAG))
     return ImageDecoder::FrameIsCompleteAtIndex(index);
   bool frame_is_received_at_index = index < frame_buffer_cache_.size();
   return frame_is_received_at_index;
 }
@@ skipping 34 matching lines @@
     return false;  // Wait until the encoded image frame data arrives.
 
   if (!IsDecodedSizeAvailable()) {
     int width = WebPDemuxGetI(demux_, WEBP_FF_CANVAS_WIDTH);
     int height = WebPDemuxGetI(demux_, WEBP_FF_CANVAS_HEIGHT);
     if (!SetSize(width, height))
       return SetFailed();
 
     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
       // an ANIM chunk must precede the ANMF frame chunks.
       repetition_count_ = WebPDemuxGetI(demux_, WEBP_FF_LOOP_COUNT);
       // 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;
     }
 
     if ((format_flags_ & ICCP_FLAG) && !IgnoresColorSpace())
       ReadColorProfile();
   }
 
   DCHECK(IsDecodedSizeAvailable());
 
@@ skipping 282 matching lines @@
         return false;
       }
     // FALLTHROUGH
     default:
       Clear();
       return SetFailed();
   }
 }
 
 }  // namespace blink