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

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * 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 37 matching lines @@
 
     m_bitmap = other.m_bitmap;
     // Keep the pixels locked since we will be writing directly into the
     // bitmap throughout this object's lifetime.
     m_bitmap.lockPixels();
     // Be sure to assign this before calling setStatus(), since setStatus() may
     // call notifyBitmapIfPixelsChanged().
     m_pixelsChanged = other.m_pixelsChanged;
     setMemoryAllocator(other.allocator());
     setOriginalFrameRect(other.originalFrameRect());
-    setStatus(other.status());
+    setStatus(other.getStatus());
     setDuration(other.duration());
-    setDisposalMethod(other.disposalMethod());
-    setAlphaBlendSource(other.alphaBlendSource());
+    setDisposalMethod(other.getDisposalMethod());
+    setAlphaBlendSource(other.getAlphaBlendSource());
     setPremultiplyAlpha(other.premultiplyAlpha());
     // Be sure that this is called after we've called setStatus(), since we
     // look at our status to know what to do with the alpha value.
     setHasAlpha(other.hasAlpha());
     setRequiredPreviousFrameIndex(other.requiredPreviousFrameIndex());
     return *this;
 }
 
 void ImageFrame::clearPixelData()
 {
@@ skipping 71 matching lines @@
 void ImageFrame::zeroFillFrameRect(const IntRect& rect)
 {
     if (rect.isEmpty())
         return;
 
     m_bitmap.eraseArea(rect, SkColorSetARGB(0, 0, 0, 0));
     setHasAlpha(true);
 }
 
 } // namespace blink