- Revision
- 126010
- Author
- [email protected]
- Date
- 2012-08-20 02:09:26 -0700 (Mon, 20 Aug 2012)
Log 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 <[email protected]> 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.
Modified Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (126009 => 126010)
--- trunk/ChangeLog 2012-08-20 09:00:16 UTC (rev 126009)
+++ trunk/ChangeLog 2012-08-20 09:09:26 UTC (rev 126010)
@@ -1,3 +1,16 @@
+2012-08-20 Dominik Röttsches <[email protected]>
+
+ [EFL] Get rid of pango backend support once harfbuzz-ng is working
+ https://bugs.webkit.org/show_bug.cgi?id=92102
+
+ 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.
+
2012-08-17 Raphael Kubo da Costa <[email protected]>
[CMake] Add FindDBus.cmake and use it in the EFL port.
Modified: trunk/Source/WebCore/ChangeLog (126009 => 126010)
--- trunk/Source/WebCore/ChangeLog 2012-08-20 09:00:16 UTC (rev 126009)
+++ trunk/Source/WebCore/ChangeLog 2012-08-20 09:09:26 UTC (rev 126010)
@@ -1,3 +1,16 @@
+2012-08-20 Dominik Röttsches <[email protected]>
+
+ [EFL] Get rid of pango backend support once harfbuzz-ng is working
+ https://bugs.webkit.org/show_bug.cgi?id=92102
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ 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.
+
2012-08-20 Pavel Feldman <[email protected]>
Web Inspector: prepare scripts panel to be lazily loaded
Modified: trunk/Source/WebCore/PlatformEfl.cmake (126009 => 126010)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-08-20 09:00:16 UTC (rev 126009)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-08-20 09:09:26 UTC (rev 126010)
@@ -173,26 +173,6 @@
${HARFBUZZ_LIBRARIES}
)
ENDIF ()
-
- IF (WTF_USE_PANGO)
- LIST(APPEND WebCore_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/graphics/pango"
- ${Pango_INCLUDE_DIRS}
- )
- LIST(APPEND WebCore_SOURCES
- platform/graphics/pango/FontPango.cpp
- platform/graphics/pango/FontCachePango.cpp
- platform/graphics/pango/FontCustomPlatformDataPango.cpp
- platform/graphics/pango/FontPlatformDataPango.cpp
- platform/graphics/pango/GlyphPageTreeNodePango.cpp
- platform/graphics/pango/SimpleFontDataPango.cpp
- platform/graphics/pango/PangoUtilities.cpp
- )
- LIST(APPEND WebCore_LIBRARIES
- ${Pango_LIBRARY}
- ${Pango_Cairo_LIBRARY}
- )
- ENDIF ()
ENDIF ()
IF (WTF_USE_ICU_UNICODE)
Modified: trunk/Source/WebKit/ChangeLog (126009 => 126010)
--- trunk/Source/WebKit/ChangeLog 2012-08-20 09:00:16 UTC (rev 126009)
+++ trunk/Source/WebKit/ChangeLog 2012-08-20 09:09:26 UTC (rev 126010)
@@ -1,3 +1,14 @@
+2012-08-20 Dominik Röttsches <[email protected]>
+
+ [EFL] Get rid of pango backend support once harfbuzz-ng is working
+ https://bugs.webkit.org/show_bug.cgi?id=92102
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Removing pango-specific includes and libraries.
+
+ * PlatformEfl.cmake: Pango sections removed.
+
2012-08-17 Rob Buis <[email protected]>
[BlackBerry] Remove some shared libraries from linking
Modified: trunk/Source/WebKit/PlatformEfl.cmake (126009 => 126010)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-08-20 09:00:16 UTC (rev 126009)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-08-20 09:09:26 UTC (rev 126010)
@@ -60,16 +60,6 @@
)
ENDIF ()
-IF (WTF_USE_PANGO)
- LIST(APPEND WebKit_INCLUDE_DIRECTORIES
- "${WEBCORE_DIR}/platform/graphics/pango"
- ${Pango_INCLUDE_DIRS}
- )
- LIST(APPEND WebKit_LIBRARIES
- ${Pango_LIBRARIES}
- )
-ENDIF ()
-
IF (ENABLE_NOTIFICATIONS)
LIST(APPEND WebKit_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/Modules/notifications"
Deleted: trunk/Source/cmake/FindPango.cmake (126009 => 126010)
--- trunk/Source/cmake/FindPango.cmake 2012-08-20 09:00:16 UTC (rev 126009)
+++ trunk/Source/cmake/FindPango.cmake 2012-08-20 09:09:26 UTC (rev 126010)
@@ -1,46 +0,0 @@
-# - Try to find Pango
-# Once done, this will define
-#
-# Pango_FOUND - system has Pango
-# Pango_INCLUDE_DIRS - the Pango include directories
-# Pango_LIBRARIES - link these to use Pango
-
-include(LibFindMacros)
-
-# Dependencies
-libfind_package(Pango Freetype)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(Pango_PKGCONF pango)
-libfind_pkg_check_modules(Pango_Cairo_PKGCONF pango)
-
-# Include dir
-find_path(Pango_INCLUDE_DIR
- NAMES pango/pango.h
- PATHS ${Pango_PKGCONF_INCLUDE_DIRS}
- PATH_SUFFIXES pango-1.0
-)
-
-find_path(Pango_Cairo_INCLUDE_DIR
- NAMES pango/pangocairo.h
- PATHS ${Pango_Cairo_PKGCONF_INCLUDE_DIRS}
- PATH_SUFFIXES pango-1.0
-)
-
-# Finally the library itself
-find_library(Pango_LIBRARY
- NAMES pango-1.0
- PATHS ${Pango_PKGCONF_LIBRARY_DIRS}
-)
-
-find_library(Pango_Cairo_LIBRARY
- NAMES pangocairo-1.0
- PATHS ${Pango_Cairo_PKGCONF_LIBRARY_DIRS}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(Pango_PROCESS_INCLUDES Pango_INCLUDE_DIR FREETYPE_INCLUDE_DIRS)
-set(Pango_PROCESS_LIBS Pango_LIBRARY FREETYPE_LIBRARIES)
-libfind_process(Pango)
-
Deleted: trunk/Source/cmake/LibFindMacros.cmake (126009 => 126010)
--- trunk/Source/cmake/LibFindMacros.cmake 2012-08-20 09:00:16 UTC (rev 126009)
+++ trunk/Source/cmake/LibFindMacros.cmake 2012-08-20 09:09:26 UTC (rev 126010)
@@ -1,99 +0,0 @@
-# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
-# used for the current package. For this to work, the first parameter must be the
-# prefix of the current package, then the prefix of the new package etc, which are
-# passed to find_package.
-macro (libfind_package PREFIX)
- set (LIBFIND_PACKAGE_ARGS ${ARGN})
- if (${PREFIX}_FIND_QUIETLY)
- set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
- endif (${PREFIX}_FIND_QUIETLY)
- if (${PREFIX}_FIND_REQUIRED)
- set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
- endif (${PREFIX}_FIND_REQUIRED)
- find_package(${LIBFIND_PACKAGE_ARGS})
-endmacro (libfind_package)
-
-# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
-# where they added pkg_check_modules. Consequently I need to support both in my scripts
-# to avoid those deprecated warnings. Here's a helper that does just that.
-# Works identically to pkg_check_modules, except that no checks are needed prior to use.
-macro (libfind_pkg_check_modules PREFIX PKGNAME)
- if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
- include(UsePkgConfig)
- pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
- else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
- pkg_check_modules(${PREFIX} ${PKGNAME})
- endif (PKG_CONFIG_FOUND)
- endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-endmacro (libfind_pkg_check_modules)
-
-# Do the final processing once the paths have been detected.
-# If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
-# all the variables, each of which contain one include directory.
-# Ditto for ${PREFIX}_PROCESS_LIBS and library files.
-# Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
-# Also handles errors in case library detection was required, etc.
-macro (libfind_process PREFIX)
- # Skip processing if already processed during this run
- if (NOT ${PREFIX}_FOUND)
- # Start with the assumption that the library was found
- set (${PREFIX}_FOUND TRUE)
-
- # Process all includes and set _FOUND to false if any are missing
- foreach (i ${${PREFIX}_PROCESS_INCLUDES})
- if (${i})
- set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
- mark_as_advanced(${i})
- else (${i})
- set (${PREFIX}_FOUND FALSE)
- endif (${i})
- endforeach (i)
-
- # Process all libraries and set _FOUND to false if any are missing
- foreach (i ${${PREFIX}_PROCESS_LIBS})
- if (${i})
- set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
- mark_as_advanced(${i})
- else (${i})
- set (${PREFIX}_FOUND FALSE)
- endif (${i})
- endforeach (i)
-
- # Print message and/or exit on fatal error
- if (${PREFIX}_FOUND)
- if (NOT ${PREFIX}_FIND_QUIETLY)
- message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
- endif (NOT ${PREFIX}_FIND_QUIETLY)
- else (${PREFIX}_FOUND)
- if (${PREFIX}_FIND_REQUIRED)
- foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
- message("${i}=${${i}}")
- endforeach (i)
- message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
- endif (${PREFIX}_FIND_REQUIRED)
- endif (${PREFIX}_FOUND)
- endif (NOT ${PREFIX}_FOUND)
-endmacro (libfind_process)
-
-macro(libfind_library PREFIX basename)
- set(TMP "")
- if(MSVC80)
- set(TMP -vc80)
- endif(MSVC80)
- if(MSVC90)
- set(TMP -vc90)
- endif(MSVC90)
- set(${PREFIX}_LIBNAMES ${basename}${TMP})
- if(${ARGC} GREATER 2)
- set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
- string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
- set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
- endif(${ARGC} GREATER 2)
- find_library(${PREFIX}_LIBRARY
- NAMES ${${PREFIX}_LIBNAMES}
- PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
- )
-endmacro(libfind_library)
-
Modified: trunk/Source/cmake/OptionsEfl.cmake (126009 => 126010)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-08-20 09:00:16 UTC (rev 126009)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-08-20 09:09:26 UTC (rev 126010)
@@ -15,12 +15,6 @@
ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
SET(WTF_PLATFORM_EFL 1)
-# -----------------------------------------------------------------------------
-# Determine which font backend will be used
-# -----------------------------------------------------------------------------
-SET(ALL_FONT_BACKENDS freetype pango)
-SET(FONT_BACKEND "freetype" CACHE STRING "choose which network backend to use (one of ${ALL_FONT_BACKENDS})")
-
FIND_PACKAGE(Cairo 1.10 REQUIRED)
FIND_PACKAGE(EFL REQUIRED)
FIND_PACKAGE(Fontconfig 2.8.0 REQUIRED)
@@ -119,18 +113,12 @@
ENDIF ()
ENDIF ()
-IF (FONT_BACKEND STREQUAL "freetype")
- FIND_PACKAGE(Freetype REQUIRED)
- FIND_PACKAGE(HarfBuzz REQUIRED)
- SET(WTF_USE_FREETYPE 1)
- SET(WTF_USE_HARFBUZZ_NG 1)
- ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
- ADD_DEFINITIONS(-DWTF_USE_HARFBUZZ_NG=1)
-ELSE ()
- FIND_PACKAGE(Pango REQUIRED)
- SET(WTF_USE_PANGO 1)
- ADD_DEFINITIONS(-DWTF_USE_PANGO=1)
-ENDIF ()
+FIND_PACKAGE(Freetype REQUIRED)
+FIND_PACKAGE(HarfBuzz REQUIRED)
+SET(WTF_USE_FREETYPE 1)
+SET(WTF_USE_HARFBUZZ_NG 1)
+ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
+ADD_DEFINITIONS(-DWTF_USE_HARFBUZZ_NG=1)
IF (NOT ENABLE_SVG)
SET(ENABLE_SVG_FONTS 0)
