From 9364f22aed35e1a1e9d07c121510f80be3ab0502 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 21 Oct 2008 07:00:00 -0700
Subject: Initial Contribution

---
 WebCore/platform/graphics/cairo/ImageSourceCairo.cpp | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'WebCore/platform/graphics/cairo/ImageSourceCairo.cpp')

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()
 {
-- 
cgit v1.1