Changeset 126010 in webkit


Ignore:
Timestamp:
Aug 20, 2012 2:09:26 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Get rid of pango backend support once harfbuzz-ng is working
​https://bugs.webkit.org/show_bug.cgi?id=92102

Patch by Dominik Röttsches <​dominik.rottsches@intel.com> on 2012-08-20
Reviewed by Kenneth Rohde Christiansen.

.:

Removing choice of font backend, Pango detection not required any more.

  • Source/cmake/FindPango.cmake: Removed.
  • Source/cmake/LibFindMacros.cmake: Removed.
  • Source/cmake/OptionsEfl.cmake: Removing choice of font backend.

Source/WebCore:

Removing support for Pango complex font rendering now that we HarfBuzz.

No new tests, no change in behavior.

  • PlatformEfl.cmake: Removing Pango specific includes and libraries.

Source/WebKit:

Removing pango-specific includes and libraries.

  • PlatformEfl.cmake: Pango sections removed.
Location:
trunk
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r125924 r126010  
     12012-08-20  Dominik Röttsches  <dominik.rottsches@intel.com>
     2
     3        [EFL] Get rid of pango backend support once harfbuzz-ng is working
     4        https://bugs.webkit.org/show_bug.cgi?id=92102
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Removing choice of font backend, Pango detection not required any more.
     9
     10        * Source/cmake/FindPango.cmake: Removed.
     11        * Source/cmake/LibFindMacros.cmake: Removed.
     12        * Source/cmake/OptionsEfl.cmake: Removing choice of font backend.
     13
    1142012-08-17  Raphael Kubo da Costa  <rakuco@webkit.org>
    215

  • trunk/Source/WebCore/ChangeLog

    r126009 r126010  
     12012-08-20  Dominik Röttsches  <dominik.rottsches@intel.com>
     2
     3        [EFL] Get rid of pango backend support once harfbuzz-ng is working
     4        https://bugs.webkit.org/show_bug.cgi?id=92102
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Removing support for Pango complex font rendering now that we HarfBuzz.
     9
     10        No new tests, no change in behavior.
     11
     12        * PlatformEfl.cmake: Removing Pango specific includes and libraries.
     13
    1142012-08-20  Pavel Feldman  <pfeldman@chromium.org>
    215

  • trunk/Source/WebCore/PlatformEfl.cmake

    r125924 r126010  
    174174    )
    175175  ENDIF ()
    176 
    177   IF (WTF_USE_PANGO)
    178     LIST(APPEND WebCore_INCLUDE_DIRECTORIES
    179       "${WEBCORE_DIR}/platform/graphics/pango"
    180       ${Pango_INCLUDE_DIRS}
    181     )
    182     LIST(APPEND WebCore_SOURCES
    183       platform/graphics/pango/FontPango.cpp
    184       platform/graphics/pango/FontCachePango.cpp
    185       platform/graphics/pango/FontCustomPlatformDataPango.cpp
    186       platform/graphics/pango/FontPlatformDataPango.cpp
    187       platform/graphics/pango/GlyphPageTreeNodePango.cpp
    188       platform/graphics/pango/SimpleFontDataPango.cpp
    189       platform/graphics/pango/PangoUtilities.cpp
    190     )
    191     LIST(APPEND WebCore_LIBRARIES
    192       ${Pango_LIBRARY}
    193       ${Pango_Cairo_LIBRARY}
    194     )
    195   ENDIF ()
    196176ENDIF ()
    197177

  • trunk/Source/WebKit/ChangeLog

    r125901 r126010  
     12012-08-20  Dominik Röttsches  <dominik.rottsches@intel.com>
     2
     3        [EFL] Get rid of pango backend support once harfbuzz-ng is working
     4        https://bugs.webkit.org/show_bug.cgi?id=92102
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Removing pango-specific includes and libraries.
     9
     10        * PlatformEfl.cmake: Pango sections removed.
     11
    1122012-08-17  Rob Buis  <rbuis@rim.com>
    213

  • trunk/Source/WebKit/PlatformEfl.cmake

    r125514 r126010  
    5858  LIST(APPEND WebKit_INCLUDE_DIRECTORIES
    5959    "${WEBCORE_DIR}/platform/graphics/freetype"
    60   )
    61 ENDIF ()
    62 
    63 IF (WTF_USE_PANGO)
    64   LIST(APPEND WebKit_INCLUDE_DIRECTORIES
    65     "${WEBCORE_DIR}/platform/graphics/pango"
    66     ${Pango_INCLUDE_DIRS}
    67   )
    68   LIST(APPEND WebKit_LIBRARIES
    69     ${Pango_LIBRARIES}
    7060  )
    7161ENDIF ()

  • trunk/Source/cmake/OptionsEfl.cmake

    r125924 r126010  
    1515ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
    1616SET(WTF_PLATFORM_EFL 1)
    17 
    18 # -----------------------------------------------------------------------------
    19 # Determine which font backend will be used
    20 # -----------------------------------------------------------------------------
    21 SET(ALL_FONT_BACKENDS freetype pango)
    22 SET(FONT_BACKEND "freetype" CACHE STRING "choose which network backend to use (one of ${ALL_FONT_BACKENDS})")
    2317
    2418FIND_PACKAGE(Cairo 1.10 REQUIRED)
    … …  
    120114ENDIF ()
    121115
    122 IF (FONT_BACKEND STREQUAL "freetype")
    123   FIND_PACKAGE(Freetype REQUIRED)
    124   FIND_PACKAGE(HarfBuzz REQUIRED)
    125   SET(WTF_USE_FREETYPE 1)
    126   SET(WTF_USE_HARFBUZZ_NG 1)
    127   ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
    128   ADD_DEFINITIONS(-DWTF_USE_HARFBUZZ_NG=1)
    129 ELSE ()
    130   FIND_PACKAGE(Pango REQUIRED)
    131   SET(WTF_USE_PANGO 1)
    132   ADD_DEFINITIONS(-DWTF_USE_PANGO=1)
    133 ENDIF ()
     116FIND_PACKAGE(Freetype REQUIRED)
     117FIND_PACKAGE(HarfBuzz REQUIRED)
     118SET(WTF_USE_FREETYPE 1)
     119SET(WTF_USE_HARFBUZZ_NG 1)
     120ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
     121ADD_DEFINITIONS(-DWTF_USE_HARFBUZZ_NG=1)
    134122
    135123IF (NOT ENABLE_SVG)
Note: See TracChangeset for help on using the changeset viewer.