Title: [161701] trunk/Source/WebCore
- Revision
- 161701
- Author
- simon.fra...@apple.com
- Date
- 2014-01-10 17:05:18 -0800 (Fri, 10 Jan 2014)
Log Message
Fix iOS build.
* platform/graphics/ImageSource.h:
(WebCore::ImageSource::acceleratedImageDecodingEnabled):
(WebCore::ImageSource::setAcceleratedImageDecodingEnabled):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161700 => 161701)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 00:55:15 UTC (rev 161700)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 01:05:18 UTC (rev 161701)
@@ -1,3 +1,11 @@
+2014-01-10 Simon Fraser <simon.fra...@apple.com>
+
+ Fix iOS build.
+
+ * platform/graphics/ImageSource.h:
+ (WebCore::ImageSource::acceleratedImageDecodingEnabled):
+ (WebCore::ImageSource::setAcceleratedImageDecodingEnabled):
+
2014-01-10 Joseph Pecoraro <pecor...@apple.com>
Unreviewed EFL build fix after r161678.
Modified: trunk/Source/WebCore/platform/graphics/ImageSource.h (161700 => 161701)
--- trunk/Source/WebCore/platform/graphics/ImageSource.h 2014-01-11 00:55:15 UTC (rev 161700)
+++ trunk/Source/WebCore/platform/graphics/ImageSource.h 2014-01-11 01:05:18 UTC (rev 161701)
@@ -166,6 +166,11 @@
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 @@
#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
};
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
