Fix iOS build.
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 01:05:18 +0000 (01:05 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 01:05:18 +0000 (01:05 +0000)
* platform/graphics/ImageSource.h:
(WebCore::ImageSource::acceleratedImageDecodingEnabled):
(WebCore::ImageSource::setAcceleratedImageDecodingEnabled):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161701 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/ImageSource.h

index 56f5849..4509b25 100644 (file)
@@ -1,3 +1,11 @@
+2014-01-10  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix iOS build.
+
+        * platform/graphics/ImageSource.h:
+        (WebCore::ImageSource::acceleratedImageDecodingEnabled):
+        (WebCore::ImageSource::setAcceleratedImageDecodingEnabled):
+
 2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
 
         Unreviewed EFL build fix after r161678.
index ab7190e..72e119a 100644 (file)
@@ -166,6 +166,11 @@ public:
     static void setMaxPixelsPerDecodedImage(unsigned maxPixels) { s_maxPixelsPerDecodedImage = maxPixels; }
 #endif
 
+#if PLATFORM(IOS)
+    static bool acceleratedImageDecodingEnabled() { return s_acceleratedImageDecoding; }
+    static void setAcceleratedImageDecodingEnabled(bool flag) { s_acceleratedImageDecoding = flag; }
+#endif
+
 private:
     NativeImageDecoderPtr m_decoder;
 
@@ -176,6 +181,12 @@ private:
 #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
     static unsigned s_maxPixelsPerDecodedImage;
 #endif
+#if PLATFORM(IOS)
+    mutable int m_baseSubsampling;
+    mutable bool m_isProgressive;
+    CFDictionaryRef imageSourceOptions(ShouldSkipMetadata, int subsampling = 0) const;
+    static bool s_acceleratedImageDecoding;
+#endif
 };
 
 }