Rename enums/functions that collide in chromium style in platform/

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

 /*
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 116 matching lines @@
     }
     return newSize;
 }
 
 ImageFrame* ImageDecoder::frameBufferAtIndex(size_t index)
 {
     if (index >= frameCount())
         return 0;
 
     ImageFrame* frame = &m_frameBufferCache[index];
-    if (frame->status() != ImageFrame::FrameComplete) {
+    if (frame->getStatus() != ImageFrame::FrameComplete) {
         PlatformInstrumentation::willDecodeImage(filenameExtension());
         decode(index);
         PlatformInstrumentation::didDecodeImage();
     }
 
     frame->notifyBitmapIfPixelsChanged();
     return frame;
 }
 
 bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const
 {
     return !frameIsCompleteAtIndex(index) || m_frameBufferCache[index].hasAlpha();
 }
 
 bool ImageDecoder::frameIsCompleteAtIndex(size_t index) const
 {
     return (index < m_frameBufferCache.size()) &&
-        (m_frameBufferCache[index].status() == ImageFrame::FrameComplete);
+        (m_frameBufferCache[index].getStatus() == ImageFrame::FrameComplete);
 }
 
 size_t ImageDecoder::frameBytesAtIndex(size_t index) const
 {
-    if (index >= m_frameBufferCache.size() || m_frameBufferCache[index].status() == ImageFrame::FrameEmpty)
+    if (index >= m_frameBufferCache.size() || m_frameBufferCache[index].getStatus() == ImageFrame::FrameEmpty)
         return 0;
 
     struct ImageSize {
 
         explicit ImageSize(IntSize size)
         {
             area = static_cast<uint64_t>(size.width()) * size.height();
         }
 
         uint64_t area;
@@ skipping 30 matching lines @@
 
 size_t ImageDecoder::findRequiredPreviousFrame(size_t frameIndex, bool frameRectIsOpaque)
 {
     ASSERT(frameIndex <= m_frameBufferCache.size());
     if (!frameIndex) {
         // The first frame doesn't rely on any previous data.
         return kNotFound;
     }
 
     const ImageFrame* currBuffer = &m_frameBufferCache[frameIndex];
-    if ((frameRectIsOpaque || currBuffer->alphaBlendSource() == ImageFrame::BlendAtopBgcolor)
+    if ((frameRectIsOpaque || currBuffer->getAlphaBlendSource() == ImageFrame::BlendAtopBgcolor)
         && currBuffer->originalFrameRect().contains(IntRect(IntPoint(), size())))
         return kNotFound;
 
     // The starting state for this frame depends on the previous frame's
     // disposal method.
     size_t prevFrame = frameIndex - 1;
     const ImageFrame* prevBuffer = &m_frameBufferCache[prevFrame];
 
-    switch (prevBuffer->disposalMethod()) {
+    switch (prevBuffer->getDisposalMethod()) {
     case ImageFrame::DisposeNotSpecified:
     case ImageFrame::DisposeKeep:
         // prevFrame will be used as the starting state for this frame.
         // FIXME: Be even smarter by checking the frame sizes and/or alpha-containing regions.
         return prevFrame;
     case ImageFrame::DisposeOverwritePrevious:
         // Frames that use the DisposeOverwritePrevious method are effectively
         // no-ops in terms of changing the starting state of a frame compared to
         // the starting state of the previous frame, so skip over them and
         // return the required previous frame of it.
@@ skipping 34 matching lines @@
     return m_planes[i];
 }
 
 size_t ImagePlanes::rowBytes(int i) const
 {
     ASSERT((i >= 0) && i < 3);
     return m_rowBytes[i];
 }
 
 } // namespace blink