Changeset 147879 in webkit


Ignore:
Timestamp:
Apr 7, 2013 2:19:46 PM (11 years ago)
Author:
Patrick Gansterer
Message:

Remove references to Skia and V8 from CMake files
​https://bugs.webkit.org/show_bug.cgi?id=114130

Reviewed by Geoffrey Garen.

.:

  • Source/cmake/OptionsBlackBerry.cmake:
  • Source/cmake/WebKitPackaging.cmake:

Source/JavaScriptCore:

  • shell/PlatformBlackBerry.cmake:

Source/WebCore:

  • PlatformBlackBerry.cmake:

Source/WebKit:

  • PlatformBlackBerry.cmake:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r147878 r147879  
     12013-04-07  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Remove references to Skia and V8 from CMake files
     4        https://bugs.webkit.org/show_bug.cgi?id=114130
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * Source/cmake/OptionsBlackBerry.cmake:
     9        * Source/cmake/WebKitPackaging.cmake:
     10
    1112013-04-07  David Kilzer  <ddkilzer@apple.com>
    212

  • trunk/Source/JavaScriptCore/ChangeLog

    r147878 r147879  
     12013-04-07  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Remove references to Skia and V8 from CMake files
     4        https://bugs.webkit.org/show_bug.cgi?id=114130
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * shell/PlatformBlackBerry.cmake:
     9
    1102013-04-07  David Kilzer  <ddkilzer@apple.com>
    211

  • trunk/Source/JavaScriptCore/shell/PlatformBlackBerry.cmake

    r136790 r147879  
    66    ${M_LIBRARY}
    77    ${Screen_LIBRARY}
    8     ${Skia_QNX_LIBRARY}
    98    ${WebKitPlatform_LIBRARY}
    109    ${SLOG2_LIBRARY}

  • trunk/Source/WebCore/ChangeLog

    r147878 r147879  
     12013-04-07  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Remove references to Skia and V8 from CMake files
     4        https://bugs.webkit.org/show_bug.cgi?id=114130
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * PlatformBlackBerry.cmake:
     9
    1102013-04-07  David Kilzer  <ddkilzer@apple.com>
    211

  • trunk/Source/WebCore/PlatformBlackBerry.cmake

    r146478 r147879  
    1111    "${WEBCORE_DIR}/bindings/cpp"
    1212    "${WEBCORE_DIR}/platform/blackberry/CookieDatabaseBackingStore"
    13     "${WEBCORE_DIR}/platform/graphics/blackberry/skia"
    1413    "${WEBCORE_DIR}/platform/graphics/harfbuzz"
    1514    "${WEBCORE_DIR}/platform/graphics/opentype/"
    16     "${WEBCORE_DIR}/platform/graphics/skia"
    17     "${WEBCORE_DIR}/platform/image-decoders/skia"
    18     "${WEBCORE_DIR}/platform/image-encoders/skia"
    1915    "${WEBCORE_DIR}/platform/network/blackberry"
    2016    "${WEBCORE_DIR}/platform/network/blackberry/rss"
    21 )
    22 
    23 # Skia sources
    24 list(APPEND WebCore_SOURCES
    25     platform/graphics/skia/FloatPointSkia.cpp
    26     platform/graphics/skia/FloatRectSkia.cpp
    27     platform/graphics/skia/FontCustomPlatformData.cpp
    28     platform/graphics/skia/GradientSkia.cpp
    29     platform/graphics/skia/GraphicsContext3DSkia.cpp
    30     platform/graphics/skia/GraphicsContextSkia.cpp
    31     platform/graphics/skia/HarfbuzzSkia.cpp
    32     platform/graphics/skia/ImageBufferSkia.cpp
    33     platform/graphics/skia/ImageSkia.cpp
    34     platform/graphics/skia/IntPointSkia.cpp
    35     platform/graphics/skia/IntRectSkia.cpp
    36     platform/graphics/skia/NativeImageSkia.cpp
    37     platform/graphics/skia/PathSkia.cpp
    38     platform/graphics/skia/PatternSkia.cpp
    39     platform/graphics/skia/PlatformContextSkia.cpp
    40     platform/graphics/skia/SkiaUtils.cpp
    41     platform/graphics/skia/TransformationMatrixSkia.cpp
    42     platform/graphics/chromium/VDMXParser.cpp
    43     platform/image-decoders/skia/ImageDecoderSkia.cpp
    44     platform/image-encoders/skia/PNGImageEncoder.cpp
    45 )
    46 
    47 # Skia font backend sources
    48 list(APPEND WebCore_SOURCES
    49     platform/graphics/blackberry/FontCacheBlackberry.cpp
    50     platform/graphics/blackberry/skia/PlatformBridge.cpp
    51     platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
    52     platform/graphics/harfbuzz/FontHarfBuzz.cpp
    53     platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp
    54     platform/graphics/harfbuzz/HarfBuzzShaper.cpp
    55     platform/graphics/harfbuzz/HarfBuzzSkia.cpp
    56     platform/graphics/skia/FontCacheSkia.cpp
    57     platform/graphics/skia/GlyphPageTreeNodeSkia.cpp
    58     platform/graphics/skia/SimpleFontDataSkia.cpp
    5917)
    6018
    … …  
    7533    platform/graphics/opentype/OpenTypeSanitizer.cpp
    7634    platform/image-encoders/JPEGImageEncoder.cpp
    77     platform/image-encoders/skia/JPEGImageEncoder.cpp
    7835    platform/posix/FileSystemPOSIX.cpp
    7936    platform/posix/SharedBufferPOSIX.cpp

  • trunk/Source/WebKit/ChangeLog

    r147844 r147879  
     12013-04-07  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Remove references to Skia and V8 from CMake files
     4        https://bugs.webkit.org/show_bug.cgi?id=114130
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * PlatformBlackBerry.cmake:
     9
    1102013-04-06  Patrick Gansterer  <paroga@webkit.org>
    211

  • trunk/Source/WebKit/PlatformBlackBerry.cmake

    r147844 r147879  
    1414    "${WEBCORE_DIR}/platform/graphics/gpu"
    1515    "${WEBCORE_DIR}/platform/graphics/blackberry"
     16    "${WEBCORE_DIR}/platform/image-encoders"
    1617    "${WEBCORE_DIR}/platform/network/blackberry"
    1718    "${WEBCORE_DIR}/testing/js"
    … …  
    2930    list(APPEND WebKit_INCLUDE_DIRECTORIES
    3031        "${WEBCORE_DIR}/Modules/notifications"
    31     )
    32 endif ()
    33 if (WTF_USE_SKIA)
    34     list(APPEND WebKit_INCLUDE_DIRECTORIES
    35         "${WEBCORE_DIR}/platform/graphics/chromium"
    36         "${WEBCORE_DIR}/platform/graphics/blackberry/skia"
    37         "${WEBCORE_DIR}/platform/graphics/skia"
    38     )
    39 else ()
    40     list(APPEND WebKit_INCLUDE_DIRECTORIES
    41         "${WEBCORE_DIR}/platform/image-encoders"
    4232    )
    4333endif ()
    … …  
    191181    ${ICUUC_LIBRARY}
    192182    ${INTL_LIBRARY}
     183    ${ITYPE_LIBRARY}
    193184    ${JPEG_LIBRARY}
    194185    ${JavaScriptCore_LIBRARY_NAME}
    … …  
    199190    ${PNG_LIBRARY}
    200191    ${SQLITE3_LIBRARY}
     192    ${WTLE_LIBRARY}
    201193    ${WebKitPlatform_LIBRARY}
    202194    ${XML2_LIBRARY}
    … …  
    204196    ${Z_LIBRARY}
    205197)
    206 
    207 if (WTF_USE_SKIA)
    208     list(APPEND WebKit_LIBRARIES
    209         ${FREETYPE_LIBRARY}
    210         ${HARFBUZZ_LIBRARY}
    211         ${Skia_LIBRARY}
    212         ${Skia_QNX_LIBRARY}
    213     )
    214 else ()
    215     list(APPEND WebKit_LIBRARIES
    216         ${ITYPE_LIBRARY}
    217         ${WTLE_LIBRARY}
    218     )
    219 endif ()
    220198
    221199if (PROFILING)

  • trunk/Source/cmake/OptionsBlackBerry.cmake

    r147212 r147879  
    6767endmacro()
    6868
    69 FIND_STAGING_LIBRARY(Skia_LIBRARY grskia)
    70 FIND_STAGING_LIBRARY(Skia_QNX_LIBRARY skia-qnx)
    7169FIND_STAGING_LIBRARY(JPEG_LIBRARY jpeg)
    7270FIND_STAGING_LIBRARY(PNG_LIBRARY png)

  • trunk/Source/cmake/WebKitPackaging.cmake

    r136790 r147879  
    128128            "/qt/" "/Qt/" "qt\\\\." "Qt\\\\."
    129129            "/qt4/" "/Qt4/" "qt4\\\\." "Qt4\\\\."
    130             "/skia/" "/Skia/" "skia\\\\." "Skia\\\\."
    131             "/v8/" "/V8/" "v8\\\\." "V8\\\\."
    132             "/V8/" "/V8/" "V8\\\\." "V8\\\\."
    133130            "/win/" "/Win/" "win\\\\." "Win\\\\."
    134131            "/wince/" "/Wince/" "wince\\\\." "Wince\\\\."
Note: See TracChangeset for help on using the changeset viewer.