summaryrefslogtreecommitdiffstats
path: root/webkit/port
diff options
context:
space:
mode:
authorpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-10 18:49:39 +0000
committerpinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-10 18:49:39 +0000
commitcf9394a2b153cf94ad320d50e380f25c8450bb6f (patch)
treec84908aaf75369e7a18e58564fe9d5710c040603 /webkit/port
parent87e0a48f8053e7d60654e16e9d89f1290ca23c38 (diff)
downloadchromium_src-cf9394a2b153cf94ad320d50e380f25c8450bb6f.zip
chromium_src-cf9394a2b153cf94ad320d50e380f25c8450bb6f.tar.gz
chromium_src-cf9394a2b153cf94ad320d50e380f25c8450bb6f.tar.bz2
remove ifdefs around code since all our port platforms will use them.
Review URL: http://codereview.chromium.org/1707 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
-rw-r--r--webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp3
-rw-r--r--webkit/port/platform/image-decoders/gif/GIFImageReader.cpp4
-rw-r--r--webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp3
-rw-r--r--webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp3
4 files changed, 0 insertions, 13 deletions
diff --git a/webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp b/webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp
index 7cc8710..68f42dd 100644
--- a/webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp
+++ b/webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -27,8 +27,6 @@
#include "GIFImageDecoder.h"
#include "GIFImageReader.h"
-#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
-
namespace WebCore {
class GIFImageDecoderPrivate
@@ -424,4 +422,3 @@ void GIFImageDecoder::gifComplete()
}
-#endif // PLATFORM(CAIRO)
diff --git a/webkit/port/platform/image-decoders/gif/GIFImageReader.cpp b/webkit/port/platform/image-decoders/gif/GIFImageReader.cpp
index 4d49f49..d44dbe6 100644
--- a/webkit/port/platform/image-decoders/gif/GIFImageReader.cpp
+++ b/webkit/port/platform/image-decoders/gif/GIFImageReader.cpp
@@ -78,8 +78,6 @@ mailing address.
#include <string.h>
#include "GIFImageDecoder.h"
-#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
-
using WebCore::GIFImageDecoder;
// Define the Mozilla macro setup so that we can leave the macros alone.
@@ -950,5 +948,3 @@ bool GIFImageReader::read(const unsigned char *buf, unsigned len,
clientptr->decodingHalted(0);
return true;
}
-
-#endif // PLATFORM(CAIRO)
diff --git a/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index f4c4412..3c05d46 100644
--- a/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -39,8 +39,6 @@
#include "JPEGImageDecoder.h"
#include <assert.h>
-#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
-
extern "C" {
#include "jpeglib.h"
}
@@ -512,4 +510,3 @@ void JPEGImageDecoder::jpegComplete()
}
-#endif // PLATFORM(CAIRO)
diff --git a/webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp b/webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp
index ed9318e..4ee7a67 100644
--- a/webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/webkit/port/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -40,8 +40,6 @@
#include "png.h"
#include "assert.h"
-#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
-
namespace WebCore {
// Gamma constants.
@@ -412,4 +410,3 @@ void PNGImageDecoder::pngComplete()
}
-#endif // PLATFORM(CAIRO)