Merge WebKit at r74534: Fix ImageSourceAndroid.cpp

Use enums instead of booleans after upstream refactoring.

See http://trac.webkit.org/changeset/73819

Change-Id: Ifbfd886e7ff3779068b9aa2f0c849b2a8a449b84

1 files changed, 4 insertions, 4 deletions

diff --git a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
index f7fc80c..982302c 100644
--- a/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
+++ b/WebCore/platform/graphics/android/ImageSourceAndroid.cpp
@@ -130,9 +130,9 @@ public:
 
 namespace WebCore {
 
-ImageSource::ImageSource(bool premultiplyAlpha, bool ignoreGammaAndColorProfile)
-    : m_premultiplyAlpha(premultiplyAlpha)
-    , m_ignoreGammaAndColorProfile(ignoreGammaAndColorProfile)
+ImageSource::ImageSource(AlphaOption alphaOption, GammaAndColorProfileOption gammaAndColorProfileOption)
+    : m_alphaOption(alphaOption)
+    , m_gammaAndColorProfileOption(gammaAndColorProfileOption)
 {
     m_decoder.m_image = NULL;
 #ifdef ANDROID_ANIMATED_GIF
@@ -274,7 +274,7 @@ void ImageSource::setData(SharedBuffer* data, bool allDataReceived)
             // Need to wait for all data received if we are assigning an
             // allocator (which we are not at the moment).
             if (!m_decoder.m_gifDecoder /*&& allDataReceived*/)
-                m_decoder.m_gifDecoder = new GIFImageDecoder(m_premultiplyAlpha, m_ignoreGammaAndColorProfile);
+                m_decoder.m_gifDecoder = new GIFImageDecoder(m_alphaOption, m_gammaAndColorProfileOption);
             int frameCount = 0;
             if (!m_decoder.m_gifDecoder->failed()) {
                 m_decoder.m_gifDecoder->setData(data, allDataReceived);