diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/WebCore.gyp/WebCore.gyp | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/WebCore.gyp/WebCore.gyp')
-rw-r--r-- | WebCore/WebCore.gyp/WebCore.gyp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp index 6b13eb5..7f586a6 100644 --- a/WebCore/WebCore.gyp/WebCore.gyp +++ b/WebCore/WebCore.gyp/WebCore.gyp @@ -158,6 +158,7 @@ '../platform/image-decoders/png', '../platform/image-decoders/skia', '../platform/image-decoders/xbm', + '../platform/image-decoders/webp', '../platform/image-encoders/skia', '../platform/mock', '../platform/network', @@ -176,6 +177,7 @@ '../svg/animation', '../svg/graphics', '../svg/graphics/filters', + '../svg/properties', '../websockets', '../workers', '../xml', @@ -722,6 +724,7 @@ '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng', '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml', '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt', + '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', ], @@ -829,6 +832,7 @@ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg', + '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng', '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml', '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt', @@ -844,6 +848,7 @@ '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl', '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg', + '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng', '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml', '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt', @@ -1173,6 +1178,7 @@ ['exclude', 'platform/image-decoders/gif/GIFImageReader\\.(cpp|h)$'], ['exclude', 'platform/image-decoders/ico/ICOImageDecoder\\.(cpp|h)$'], ['exclude', 'platform/image-decoders/jpeg/JPEGImageDecoder\\.(cpp|h)$'], + ['exclude', 'platform/image-decoders/webp/WEBPImageDecoder\\.(cpp|h)$'], ['exclude', 'platform/image-decoders/png/PNGImageDecoder\\.(cpp|h)$'], ['exclude', 'platform/image-decoders/skia/ImageDecoderSkia\\.cpp$'], ['exclude', 'platform/image-decoders/xbm/XBMImageDecoder\\.(cpp|h)$'], @@ -1202,6 +1208,11 @@ ['exclude', 'Posix\\.cpp$'], ], }], + ['"ENABLE_CLIENT_BASED_GEOLOCATION=1" in feature_defines', { + 'sources/': [ + ['exclude', '/GeolocationService.*$'], + ], + }], ], }, { @@ -1278,7 +1289,6 @@ # be nice to provide more explicit comments. Some of these do actually # compile. ['exclude', 'dom/StaticStringList\\.cpp$'], - ['exclude', 'loader/icon/IconFetcher\\.cpp$'], ['exclude', 'loader/UserStyleSheetLoader\\.cpp$'], # We use a multi-process version from the WebKit API. |