Changeset 39233 in webkit

Timestamp:

Dec 12, 2008, 2:54:42 AM (16 years ago)

Author:

vestbo@webkit.org

Message:

2008-12-12 Tor Arne Vestbø <​tavestbo@trolltech.com>

Reviewed by Simon Hausmann.

Implement ImageSource::filenameExtension() for the Qt port

We're using QImageReader::imageFormat().toLower() to check
that the image format is supported, and if it is we store
the resulting extension when creating the ImageDecoderQt.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/ImageDecoderQt.cpp (modified) (4 diffs)
• platform/graphics/qt/ImageDecoderQt.h (modified) (3 diffs)
• platform/graphics/qt/ImageSourceQt.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-12  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        Implement ImageSource::filenameExtension() for the Qt port
+        
+        We're using QImageReader::imageFormat().toLower() to check
+        that the image format is supported, and if it is we store
+        the resulting extension when creating the ImageDecoderQt.
+
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoderQt::create):
+        (WebCore::ImageDecoderQt::ImageDecoderQt):
+        (WebCore::ImageDecoderQt::imageFormat):
+        * platform/graphics/qt/ImageDecoderQt.h:
+        * platform/graphics/qt/ImageSourceQt.cpp:
+        (WebCore::ImageSource::setData):
+        (WebCore::ImageSource::filenameExtension):
+
 2008-12-11  Stephanie Lewis  <slewis@apple.com>
 

trunk/WebCore/platform/graphics/qt/ImageDecoderQt.cpp

@@ -179 +179 @@
 }
 
-
-// ImageDecoderQt
-ImageDecoderQt::ImageDecoderQt( )
+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 = QImageReader::imageFormat(&buffer).toLower();
+    if (imageFormat.isEmpty())
+        return 0; // Image format not supported
+
+    return new ImageDecoderQt(imageFormat);
+}
+
+ImageDecoderQt::ImageDecoderQt(const QString &imageFormat)
+    : m_imageFormat(imageFormat)
 {
 }
@@ -255 +272 @@
 }
 
-
 int ImageDecoderQt::repetitionCount() const
 {
@@ -262 +278 @@
     return m_loopCount;
 }
-
 
 bool ImageDecoderQt::supportsAlpha() const
@@ -275 +290 @@
     return  m_imageList[index].m_duration;
 }
+
+QString ImageDecoderQt::imageFormat() const
+{
+    if (debugImageDecoderQt)
+           qDebug() << " ImageDecoderQt::imageFormat() returns" << m_imageFormat;
+    return m_imageFormat;
+};
 
 RGBA32Buffer* ImageDecoderQt::frameBufferAtIndex(size_t index)

trunk/WebCore/platform/graphics/qt/ImageDecoderQt.h

@@ -39 +39 @@
 class ImageDecoderQt : public ImageDecoder
 {
-    ImageDecoderQt(const ImageDecoderQt&);
-    ImageDecoderQt &operator=(const ImageDecoderQt&);
 public:
-    ImageDecoderQt();
+    static ImageDecoderQt* create(const SharedBuffer& data);
     ~ImageDecoderQt();
 
@@ -48 +46 @@
 
     virtual void setData(const IncomingData& data, bool allDataReceived);
-
     virtual bool isSizeAvailable() const;
-
     virtual int frameCount() const;
-
-
     virtual int repetitionCount() const;
-
-
     virtual RGBA32Buffer* frameBufferAtIndex(size_t index);
 
     QPixmap* imageAtIndex(size_t index) const;
-
     virtual bool supportsAlpha() const;
-
     int duration(size_t index) const;
+    QString imageFormat() const;
 
     void clearFrame(size_t index);
+
 private:
+    ImageDecoderQt(const QString &imageFormat);
+    ImageDecoderQt(const ImageDecoderQt&);
+    ImageDecoderQt &operator=(const ImageDecoderQt&);
+
     class ReadContext;
     void reset();
@@ -90 +86 @@
     mutable QHash<int, QPixmap> m_pixmapCache;
     int m_loopCount;
+    QString m_imageFormat;
 };
 

trunk/WebCore/platform/graphics/qt/ImageSourceQt.cpp

@@ -38 +38 @@
 
 namespace WebCore {
-static bool canHandleImage(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 false;
-
-    QByteArray data = QByteArray::fromRawData(_data.data(), _data.size());
-    QBuffer buffer(&data);
-    if (!buffer.open(QBuffer::ReadOnly))
-        return false;
-
-    return !QImageReader::imageFormat(&buffer).isEmpty();
-}
-
-ImageDecoderQt* createDecoder(const SharedBuffer& data) {
-    if (!canHandleImage(data))
-        return 0;
-    return new ImageDecoderQt();
-}
 
 ImageSource::ImageSource()
@@ -80 +61 @@
     // made.
     if (!m_decoder)
-        m_decoder = createDecoder(*data);
+        m_decoder = ImageDecoderQt::create(*data);
 
     if (!m_decoder)
@@ -90 +71 @@
 String ImageSource::filenameExtension() const
 {
-    notImplemented();
-    return String();
+    if (!m_decoder)
+        return String();
+
+    return m_decoder->imageFormat();
 }