diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-10-21 07:00:00 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-10-21 07:00:00 -0700 |
| commit | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (patch) | |
| tree | d49911209b132da58d838efa852daf28d516df21 /WebCore/platform/graphics/cairo/ImageSourceCairo.cpp | |
| parent | 87eb0cb35bad8784770ebc807e6c982432e47107 (diff) | |
| download | external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.zip external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.gz external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.bz2 | |
Initial Contribution
Diffstat (limited to 'WebCore/platform/graphics/cairo/ImageSourceCairo.cpp')
| -rw-r--r-- | WebCore/platform/graphics/cairo/ImageSourceCairo.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/WebCore/platform/graphics/cairo/ImageSourceCairo.cpp b/WebCore/platform/graphics/cairo/ImageSourceCairo.cpp index 66e39ba..8cc15b3 100644 --- a/WebCore/platform/graphics/cairo/ImageSourceCairo.cpp +++ b/WebCore/platform/graphics/cairo/ImageSourceCairo.cpp @@ -26,20 +26,18 @@ #include "config.h" #include "ImageSource.h" +#include "SharedBuffer.h" #if PLATFORM(CAIRO) -#include "BMPImageDecoder.h" #include "GIFImageDecoder.h" -#include "ICOImageDecoder.h" #include "JPEGImageDecoder.h" #include "PNGImageDecoder.h" -#include "SharedBuffer.h" -#include <cairo.h> - -#if !PLATFORM(WIN) +#include "BMPImageDecoder.h" +#include "ICOImageDecoder.h" #include "XBMImageDecoder.h" -#endif + +#include <cairo.h> namespace WebCore { @@ -80,20 +78,17 @@ ImageDecoder* createDecoder(const Vector<char>& data) !memcmp(contents, "\000\000\002\000", 4)) return new ICOImageDecoder(); -#if !PLATFORM(WIN) // XBMs require 8 bytes of info. if (length >= 8 && strncmp(contents, "#define ", 8) == 0) return new XBMImageDecoder(); -#endif // Give up. We don't know what the heck this is. return 0; } ImageSource::ImageSource() - : m_decoder(0) -{ -} + : m_decoder(0) +{} ImageSource::~ImageSource() { |