-
pkasting@chromium.org authored
Reviewed by Eric Seidel. https://bugs.webkit.org/show_bug.cgi?id=25709 part eight Replace placeholder Cairo BMP, ICO, XBM decoders with real ones. Remove all the decoders from skia/ since they are now just mirrors of the Cairo ones. * GNUmakefile.am: * WebCore.vcproj/WebCore.vcproj: * WebCoreSources.bkl: * platform/graphics/cairo/ImageSourceCairo.cpp: (WebCore::createDecoder): Pass IntSize() to ICOImageDecoder() so it will always decode the largest icon. Enable XBM decoding on Windows. * platform/graphics/skia/ImageSourceSkia.cpp: * platform/graphics/wx/ImageSourceWx.cpp: (WebCore::createDecoder): Pass IntSize() to ICOImageDecoder() so it will always decode the largest icon. * platform/image-decoders/bmp/BMPImageDecoder.cpp: Replaced with WebCore/platform/image-decoders/skia/BMPImageDecoder.cpp. * platform/image-decoders/bmp/BMPImageDecoder.h: Replaced with WebCore/platform/image-decoders/skia/BMPImageDecoder.h. * platform/image-decoders/bmp/BMPImageReader.cpp: Copied from WebCore/platform/image-decoders/skia/BMPImageReader.cpp. * platform/image-decoders/bmp/BMPImageReader.h: Copied from WebCore/platform/image-decoders/skia/BMPImageReader.h. * platform/image-decoders/ico/ICOImageDecoder.cpp: Replaced with WebCore/platform/image-decoders/skia/ICOImageDecoder.cpp. * platform/image-decoders/ico/ICOImageDecoder.h: Replaced with WebCore/platform/image-decoders/skia/ICOImageDecoder.h. * platform/image-decoders/skia/BMPImageDecoder.cpp: Removed. * platform/image-decoders/skia/BMPImageDecoder.h: Removed. * platform/image-decoders/skia/BMPImageReader.cpp: Removed. * platform/image-decoders/skia/BMPImageReader.h: Removed. * platform/image-decoders/skia/GIFImageDecoder.cpp: Removed. * platform/image-decoders/skia/GIFImageDecoder.h: Removed. * platform/image-decoders/skia/GIFImageReader.cpp: Removed. * platform/image-decoders/skia/GIFImageReader.h: Removed. * platform/image-decoders/skia/ICOImageDecoder.cpp: Removed. * platform/image-decoders/skia/ICOImageDecoder.h: Removed. * platform/image-decoders/skia/JPEGImageDecoder.cpp: Removed. * platform/image-decoders/skia/JPEGImageDecoder.h: Removed. * platform/image-decoders/skia/PNGImageDecoder.cpp: Removed. * platform/image-decoders/skia/PNGImageDecoder.h: Removed. * platform/image-decoders/skia/XBMImageDecoder.cpp: Removed. * platform/image-decoders/skia/XBMImageDecoder.h: Removed. * platform/image-decoders/xbm/XBMImageDecoder.cpp: Replaced with WebCore/platform/image-decoders/skia/XBMImageDecoder.cpp. * platform/image-decoders/xbm/XBMImageDecoder.h: Replaced with WebCore/platform/image-decoders/skia/XBMImageDecoder.h. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44634 268f45cc-cd09-0410-ab3c-d52691b4dbfc
10e5b780