Changeset 73736 in webkit
- Timestamp:
- Dec 10, 2010 9:16:53 AM (13 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r73731 r73736 1 2010-12-10 Hironori Bono <hbono@chromium.org> 2 3 Reviewed by Ojan Vafai. 4 5 [Chromium] Use libjpeg-turbo instead of libjpeg 6 https://bugs.webkit.org/show_bug.cgi?id=50054 7 8 This change replaces the hard-coded path to the GYP files of the JPEG 9 library with a 'libjpeg_gyp_path' variable, which is added by Chromium 10 r68453. (When building WebKit Chromium, this change sets its value to 11 '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp' to avoid changing 12 the current behavior.) 13 14 No new tests since this does not change the code at all. 15 16 * WebCore.gyp/WebCore.gyp: 17 1 18 2010-12-10 Chris Marrin <cmarrin@apple.com> 2 19 -
trunk/WebCore/WebCore.gyp/WebCore.gyp
r73283 r73736 40 40 ['inside_chromium_build==0', { 41 41 # Webkit is being built outside of the full chromium project. 42 'variables': {'chromium_src_dir': '../../WebKit/chromium'}, 42 'variables': { 43 'chromium_src_dir': '../../WebKit/chromium', 44 'libjpeg_gyp_path': '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp', 45 }, 43 46 },{ 44 47 # WebKit is checked out in src/chromium/third_party/WebKit … … 725 728 '<(chromium_src_dir)/skia/skia.gyp:skia', 726 729 '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 727 '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',728 730 '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng', 729 731 '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml', … … 732 734 '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi', 733 735 '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', 736 '<(libjpeg_gyp_path):libjpeg', 734 737 ], 735 738 'include_dirs': [ … … 837 840 '<(chromium_src_dir)/skia/skia.gyp:skia', 838 841 '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 839 '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',840 842 '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', 841 843 '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng', … … 846 848 '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', 847 849 '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common', 850 '<(libjpeg_gyp_path):libjpeg', 848 851 ], 849 852 'export_dependent_settings': [ … … 854 857 '<(chromium_src_dir)/skia/skia.gyp:skia', 855 858 '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 856 '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',857 859 '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp', 858 860 '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng', … … 863 865 '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite', 864 866 '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common', 867 '<(libjpeg_gyp_path):libjpeg', 865 868 ], 866 869 # This is needed for mac because of webkit_system_interface. It'd be nice
Note: See TracChangeset
for help on using the changeset viewer.