auto import from //depot/cupcake/@136594

1 files changed, 26 insertions, 4 deletions

diff --git a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
index e3b00a1..394c7a7 100644
--- a/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+++ b/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
@@ -178,9 +178,26 @@ ImageDecoderQt::ReadContext::IncrementalReadResult
     return IncrementalReadComplete;
 }
 
+ImageDecoderQt* ImageDecoderQt::create(const SharedBuffer& data)
+{
+    // We need at least 4 bytes to figure out what kind of image we're dealing with.
+    if (data.size() < 4)
+        return 0;
+
+    QByteArray bytes = QByteArray::fromRawData(data.data(), data.size());
+    QBuffer buffer(&bytes);
+    if (!buffer.open(QBuffer::ReadOnly))
+        return 0;
+
+    QString imageFormat = QString::fromLatin1(QImageReader::imageFormat(&buffer).toLower());
+    if (imageFormat.isEmpty())
+        return 0; // Image format not supported
+
+    return new ImageDecoderQt(imageFormat);
+}
 
-// ImageDecoderQt
-ImageDecoderQt::ImageDecoderQt( )
+ImageDecoderQt::ImageDecoderQt(const QString &imageFormat)
+    : m_imageFormat(imageFormat)
 {
 }
 
@@ -254,7 +271,6 @@ int ImageDecoderQt::frameCount() const
     return m_imageList.size();
 }
 
-
 int ImageDecoderQt::repetitionCount() const
 {
     if (debugImageDecoderQt)
@@ -262,7 +278,6 @@ int ImageDecoderQt::repetitionCount() const
     return m_loopCount;
 }
 
-
 bool ImageDecoderQt::supportsAlpha() const
 {
     return hasFirstImageHeader() && m_imageList[0].m_image.hasAlphaChannel();
@@ -275,6 +290,13 @@ int ImageDecoderQt::duration(size_t index) const
     return  m_imageList[index].m_duration;
 }
 
+String ImageDecoderQt::filenameExtension() const
+{
+    if (debugImageDecoderQt)
+           qDebug() << " ImageDecoderQt::filenameExtension() returns" << m_imageFormat;
+    return m_imageFormat;
+};
+
 RGBA32Buffer* ImageDecoderQt::frameBufferAtIndex(size_t index)
 {
     Q_ASSERT("use imageAtIndex instead");