Changeset 47868 in webkit

Timestamp:

Aug 28, 2009 11:08:38 AM (15 years ago)

Author:

pkasting@chromium.org

Message:

​https://bugs.webkit.org/show_bug.cgi?id=27965
Move ImageDecoder creation function to a factory function on
ImageDecoder. This is arguably where it makes the most sense anyway,
and it will (soon) allow ImageSourceQt.cpp to have one less dedicated
function.

Reviewed by Eric Seidel.

• platform/graphics/ImageSource.cpp:
• platform/graphics/qt/ImageDecoderQt.cpp:

(WebCore::ImageDecoder::create):

• platform/graphics/qt/ImageDecoderQt.h:
• platform/graphics/qt/ImageSourceQt.cpp:

(WebCore::ImageSource::setData):

• platform/image-decoders/ImageDecoder.cpp:
• platform/image-decoders/ImageDecoder.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImageSource.cpp (modified) (3 diffs)
• platform/graphics/qt/ImageDecoderQt.cpp (modified) (2 diffs)
• platform/graphics/qt/ImageDecoderQt.h (modified) (1 diff)
• platform/graphics/qt/ImageSourceQt.cpp (modified) (1 diff)
• platform/image-decoders/ImageDecoder.cpp (modified) (1 diff)
• platform/image-decoders/ImageDecoder.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-28  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27965
+        Move ImageDecoder creation function to a factory function on
+        ImageDecoder.  This is arguably where it makes the most sense anyway,
+        and it will (soon) allow ImageSourceQt.cpp to have one less dedicated
+        function.
+
+        * platform/graphics/ImageSource.cpp:
+        * platform/graphics/qt/ImageDecoderQt.cpp:
+        (WebCore::ImageDecoder::create):
+        * platform/graphics/qt/ImageDecoderQt.h:
+        * platform/graphics/qt/ImageSourceQt.cpp:
+        (WebCore::ImageSource::setData):
+        * platform/image-decoders/ImageDecoder.cpp:
+        * platform/image-decoders/ImageDecoder.h:
+
 2009-08-28  Peter Kasting  <pkasting@google.com>
 

trunk/WebCore/platform/graphics/ImageSource.cpp

@@ -30 +30 @@
 #include "ImageSource.h"
 
-#include "BMPImageDecoder.h"
-#include "GIFImageDecoder.h"
-#include "ICOImageDecoder.h"
-#include "JPEGImageDecoder.h"
-#include "PNGImageDecoder.h"
-#include "SharedBuffer.h"
-#include "XBMImageDecoder.h"
+#include "ImageDecoder.h"
 
 #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
@@ -45 +39 @@
 
 namespace WebCore {
-
-ImageDecoder* createDecoder(const Vector<char>& data)
-{
-    // We need at least 4 bytes to figure out what kind of image we're dealing with.
-    int length = data.size();
-    if (length < 4)
-        return 0;
-
-    const unsigned char* uContents = (const unsigned char*)data.data();
-    const char* contents = data.data();
-
-    // GIFs begin with GIF8(7 or 9).
-    if (strncmp(contents, "GIF8", 4) == 0)
-        return new GIFImageDecoder();
-
-    // Test for PNG.
-    if (uContents[0]==0x89 &&
-        uContents[1]==0x50 &&
-        uContents[2]==0x4E &&
-        uContents[3]==0x47)
-        return new PNGImageDecoder();
-
-    // JPEG
-    if (uContents[0]==0xFF &&
-        uContents[1]==0xD8 &&
-        uContents[2]==0xFF)
-        return new JPEGImageDecoder();
-
-    // BMP
-    if (strncmp(contents, "BM", 2) == 0)
-        return new BMPImageDecoder();
-
-    // ICOs always begin with a 2-byte 0 followed by a 2-byte 1.
-    // CURs begin with 2-byte 0 followed by 2-byte 2.
-    if (!memcmp(contents, "\000\000\001\000", 4) ||
-        !memcmp(contents, "\000\000\002\000", 4))
-        return new ICOImageDecoder();
-
-    // XBMs require 8 bytes of info.
-    if (length >= 8 && strncmp(contents, "#define ", 8) == 0)
-        return new XBMImageDecoder();
-
-    // Give up. We don't know what the heck this is.
-    return 0;
-}
 
 ImageSource::ImageSource()
@@ -127 +76 @@
     // made.
     if (!m_decoder) {
-        m_decoder = createDecoder(data->buffer());
+        m_decoder = static_cast<NativeImageSourcePtr>(ImageDecoder::create(*data));
 #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
         if (m_decoder)

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

@@ -42 +42 @@
 
 namespace WebCore {
+
+  ImageDecoder* ImageDecoder::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::ImageData::ImageData(const QImage& image, ImageState imageState, int duration) :
     m_image(image), m_imageState(imageState), m_duration(duration)
@@ -179 +198 @@
 }
 
-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(const QString &imageFormat)
     : m_hasAlphaChannel(false)

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

@@ -40 +40 @@
 {
 public:
-    static ImageDecoderQt* create(const SharedBuffer& data);
     ~ImageDecoderQt();
 

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

@@ -60 +60 @@
     // made.
     if (!m_decoder)
-        m_decoder = ImageDecoderQt::create(*data);
+        m_decoder = static_cast<NativeImageSourcePtr>(ImageDecoder::create(*data));
 
     if (!m_decoder)

trunk/WebCore/platform/image-decoders/ImageDecoder.cpp

@@ -27 +27 @@
 #endif
 
+#include "BMPImageDecoder.h"
+#include "GIFImageDecoder.h"
+#include "ICOImageDecoder.h"
+#include "JPEGImageDecoder.h"
+#include "PNGImageDecoder.h"
+#include "SharedBuffer.h"
+#include "XBMImageDecoder.h"
+
 namespace WebCore {
+
+ImageDecoder* ImageDecoder::create(const SharedBuffer& data)
+{
+    // We need at least 4 bytes to figure out what kind of image we're dealing with.
+    int length = data.size();
+    if (length < 4)
+        return 0;
+
+    const unsigned char* uContents = (const unsigned char*)data.data();
+    const char* contents = data.data();
+
+    // GIFs begin with GIF8(7 or 9).
+    if (strncmp(contents, "GIF8", 4) == 0)
+        return new GIFImageDecoder();
+
+    // Test for PNG.
+    if (uContents[0]==0x89 &&
+        uContents[1]==0x50 &&
+        uContents[2]==0x4E &&
+        uContents[3]==0x47)
+        return new PNGImageDecoder();
+
+    // JPEG
+    if (uContents[0]==0xFF &&
+        uContents[1]==0xD8 &&
+        uContents[2]==0xFF)
+        return new JPEGImageDecoder();
+
+    // BMP
+    if (strncmp(contents, "BM", 2) == 0)
+        return new BMPImageDecoder();
+
+    // ICOs always begin with a 2-byte 0 followed by a 2-byte 1.
+    // CURs begin with 2-byte 0 followed by 2-byte 2.
+    if (!memcmp(contents, "\000\000\001\000", 4) ||
+        !memcmp(contents, "\000\000\002\000", 4))
+        return new ICOImageDecoder();
+
+    // XBMs require 8 bytes of info.
+    if (length >= 8 && strncmp(contents, "#define ", 8) == 0)
+        return new XBMImageDecoder();
+
+    // Give up. We don't know what the heck this is.
+    return 0;
+}
 
 #if !PLATFORM(SKIA)

trunk/WebCore/platform/image-decoders/ImageDecoder.h

@@ -196 +196 @@
         virtual ~ImageDecoder() {}
 
+        // Factory function to create an ImageDecoder.  Ports that subclass
+        // ImageDecoder can provide their own implementation of this to avoid
+        // needing to write a dedicated setData() implementation.
+        static ImageDecoder* create(const SharedBuffer& data);
+
         // The the filename extension usually associated with an undecoded image of this type.
         virtual String filenameExtension() const = 0;