Changeset 73736 in webkit


Ignore:
Timestamp:
Dec 10, 2010 9:16:53 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-12-10 Hironori Bono <hbono@chromium.org>

Reviewed by Ojan Vafai.

[Chromium] Use libjpeg-turbo instead of libjpeg
https://bugs.webkit.org/show_bug.cgi?id=50054

This change replaces the hard-coded path to the GYP files of the JPEG
library with a 'libjpeg_gyp_path' variable, which is added by Chromium
r68453. (When building WebKit Chromium, this change sets its value to
'<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp' to avoid changing
the current behavior.)

No new tests since this does not change the code at all.

  • WebCore.gyp/WebCore.gyp:
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r73731 r73736  
     12010-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
    1182010-12-10  Chris Marrin  <cmarrin@apple.com>
    219
  • trunk/WebCore/WebCore.gyp/WebCore.gyp

    r73283 r73736  
    4040    ['inside_chromium_build==0', {
    4141      # 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      },
    4346    },{
    4447      # WebKit is checked out in src/chromium/third_party/WebKit
     
    725728        '<(chromium_src_dir)/skia/skia.gyp:skia',
    726729        '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
    727         '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
    728730        '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
    729731        '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
     
    732734        '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
    733735        '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
     736        '<(libjpeg_gyp_path):libjpeg',
    734737      ],
    735738      'include_dirs': [
     
    837840        '<(chromium_src_dir)/skia/skia.gyp:skia',
    838841        '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
    839         '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
    840842        '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
    841843        '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
     
    846848        '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
    847849        '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
     850        '<(libjpeg_gyp_path):libjpeg',
    848851      ],
    849852      'export_dependent_settings': [
     
    854857        '<(chromium_src_dir)/skia/skia.gyp:skia',
    855858        '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
    856         '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
    857859        '<(chromium_src_dir)/third_party/libwebp/libwebp.gyp:libwebp',
    858860        '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
     
    863865        '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
    864866        '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
     867        '<(libjpeg_gyp_path):libjpeg',
    865868      ],
    866869      # This is needed for mac because of webkit_system_interface. It'd be nice
Note: See TracChangeset for help on using the changeset viewer.