diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index a57b3d6d0a8b89552caf83aa6facad6248b5a3b6..9e9d9606e49b389a40a30fd273ddd6c9ed3ab8d3 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2010-08-30 Marc-Antoine Ruel + + Reviewed by Kent Tamura + + Move most dependencies to webcore_prerequisites + https://bugs.webkit.org/show_bug.cgi?id=44814 + + * WebCore.gyp/WebCore.gyp: + 2010-08-30 Adam Barth Move AsyncImageResizer back to html to fix Chromium build. diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp index 87906a4ff774c14365c54e73f9c162609dcb9456..1402e00c6f772461612590621b015e96c564426a 100644 --- a/WebCore/WebCore.gyp/WebCore.gyp +++ b/WebCore/WebCore.gyp/WebCore.gyp @@ -870,6 +870,12 @@ }, 'conditions': [ ['javascript_engine=="v8"', { + 'dependencies': [ + '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + ], + 'export_dependent_settings': [ + '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', + ], 'conditions': [ ['inside_chromium_build==1 and OS=="win" and component=="shared_library"', { 'defines': [ @@ -878,7 +884,23 @@ }], ], }], + ['use_accelerated_compositing==1', { + 'dependencies': [ + '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib', + ], + 'export_dependent_settings': [ + '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib', + ], + }], ['OS=="linux" or OS=="freebsd"', { + 'dependencies': [ + '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', + '<(chromium_src_dir)/build/linux/system.gyp:gtk', + ], + 'export_dependent_settings': [ + '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', + '<(chromium_src_dir)/build/linux/system.gyp:gtk', + ], 'cflags': [ # WebCore does not work with strict aliasing enabled. # https://bugs.webkit.org/show_bug.cgi?id=25864 @@ -895,6 +917,12 @@ ], }], ['OS=="mac"', { + 'dependencies': [ + 'webkit_system_interface', + ], + 'export_dependent_settings': [ + 'webkit_system_interface', + ], 'defines': [ # Match Safari and Mozilla on Mac x86. 'WEBCORE_NAVIGATOR_PLATFORM="MacIntel"', @@ -925,6 +953,12 @@ ], }], ['OS=="win"', { + 'dependencies': [ + '<(chromium_src_dir)/build/win/system.gyp:cygwin' + ], + 'export_dependent_settings': [ + '<(chromium_src_dir)/build/win/system.gyp:cygwin' + ], 'defines': [ # Match Safari and Mozilla on Windows. 'WEBCORE_NAVIGATOR_PLATFORM="Win32"', @@ -1074,11 +1108,6 @@ ], }, 'conditions': [ - ['javascript_engine=="v8"', { - 'dependencies': [ - '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', - ], - }], ['enable_svg!=0', { 'sources/': [ ['exclude', 'svg/[^/]+\\.cpp$'], @@ -1093,16 +1122,7 @@ ['exclude', 'rendering/SVG'], ], }], - ['use_accelerated_compositing==1', { - 'dependencies': [ - '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib', - ], - }], ['OS=="linux" or OS=="freebsd"', { - 'dependencies': [ - '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', - '<(chromium_src_dir)/build/linux/system.gyp:gtk', - ], 'sources': [ '../platform/graphics/chromium/VDMXParser.cpp', '../platform/graphics/chromium/HarfbuzzSkia.cpp', @@ -1245,9 +1265,6 @@ ], }], ['OS=="win"', { - 'dependencies': [ - '<(chromium_src_dir)/build/win/system.gyp:cygwin' - ], 'sources/': [ ['exclude', 'Posix\\.cpp$'], ['include', '/opentype/'],