diff options
5 files changed, 2 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) diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index a184e03..b63ec2b 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -8553,6 +8553,7 @@ "$(CONFIGURATION_TEMP_DIR)/generated/include/v8", "$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8", "$(CONFIGURATION_TEMP_DIR)/generated/WebCore/JavaScriptHeaders/v8", + "$(DIR_THIRD_PARTY)/libjpeg", "$(DIR_THIRD_PARTY)/libpng", ); PRODUCT_NAME = port; @@ -8571,6 +8572,7 @@ "$(CONFIGURATION_TEMP_DIR)/generated/include/v8", "$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8", "$(CONFIGURATION_TEMP_DIR)/generated/WebCore/JavaScriptHeaders/v8", + "$(DIR_THIRD_PARTY)/libjpeg", "$(DIR_THIRD_PARTY)/libpng", ); PRODUCT_NAME = port; |