From 935a4d59d9122f5c5aaa07b32aad4deccf90178f Mon Sep 17 00:00:00 2001 From: "ajwong@chromium.org" Date: Thu, 11 Jun 2009 01:05:38 +0000 Subject: Remove skia image-decoders for mac build. Mac uses CoreGraphics anyways. Review URL: http://codereview.chromium.org/123002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18129 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/test_shell.gyp | 8 ++++++++ webkit/webkit.gyp | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 730e46f..5932b77 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -504,6 +504,14 @@ # disable plugin tests until we re-enable plugins for chromium.app 'sources!': [ 'plugin_tests.cc', + + # Disable the image decoder tests because we use CoreGraphics + # code on mac and these tests are for the Skia image-decoders. + '../webcore_unit_tests/BMPImageDecoder_unittest.cpp', + '../webcore_unit_tests/ICOImageDecoder_unittest.cpp', + '../webcore_unit_tests/XBMImageDecoder_unittest.cpp', + 'image_decoder_unittest.cc', + 'image_decoder_unittest.h', ] }], ['OS=="win"', { diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index a145e7a..e032747 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -4106,6 +4106,26 @@ '../third_party/WebKit/WebCore/platform/graphics/skia/PathSkia.cpp', '../third_party/WebKit/WebCore/platform/graphics/skia/PatternSkia.cpp', '../third_party/WebKit/WebCore/platform/graphics/skia/TransformationMatrixSkia.cpp', + + # Skia image-decoders are also not used on mac. CoreGraphics + # is used directly instead. + '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageDecoder.cpp', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageDecoder.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageReader.cpp', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageReader.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageDecoder.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageReader.cpp', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageReader.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/ICOImageDecoder.cpp', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/ICOImageDecoder.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/ImageDecoder.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/JPEGImageDecoder.cpp', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/JPEGImageDecoder.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/PNGImageDecoder.cpp', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/PNGImageDecoder.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/XBMImageDecoder.cpp', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/XBMImageDecoder.h', ], 'link_settings': { 'libraries': [ -- cgit v1.1