Title: [217508] trunk/Source/WebCore
Revision
217508
Author
[email protected]
Date
2017-05-26 14:41:19 -0700 (Fri, 26 May 2017)

Log Message

[CMake] Consolidate CMake code related to FreeType
https://bugs.webkit.org/show_bug.cgi?id=172656

Patch by Don Olmstead <[email protected]> on 2017-05-26
Reviewed by Michael Catanzaro.

No new tests. No change in behavior.

* PlatformGTK.cmake:
* PlatformWPE.cmake:
* platform/FreeType.cmake: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (217507 => 217508)


--- trunk/Source/WebCore/ChangeLog	2017-05-26 21:33:15 UTC (rev 217507)
+++ trunk/Source/WebCore/ChangeLog	2017-05-26 21:41:19 UTC (rev 217508)
@@ -1,3 +1,16 @@
+2017-05-26  Don Olmstead  <[email protected]>
+
+        [CMake] Consolidate CMake code related to FreeType
+        https://bugs.webkit.org/show_bug.cgi?id=172656
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests. No change in behavior.
+
+        * PlatformGTK.cmake:
+        * PlatformWPE.cmake:
+        * platform/FreeType.cmake: Added.
+
 2017-05-26  Sam Weinig  <[email protected]>
 
         [WebIDL] Another bindings cleanup pass, this time focusing on attributes

Modified: trunk/Source/WebCore/PlatformGTK.cmake (217507 => 217508)


--- trunk/Source/WebCore/PlatformGTK.cmake	2017-05-26 21:33:15 UTC (rev 217507)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2017-05-26 21:41:19 UTC (rev 217508)
@@ -1,4 +1,5 @@
 include(platform/Cairo.cmake)
+include(platform/FreeType.cmake)
 include(platform/GStreamer.cmake)
 include(platform/ImageDecoders.cmake)
 include(platform/Linux.cmake)
@@ -23,9 +24,6 @@
     "${WEBCORE_DIR}/platform/graphics/egl"
     "${WEBCORE_DIR}/platform/graphics/glx"
     "${WEBCORE_DIR}/platform/graphics/gtk"
-    "${WEBCORE_DIR}/platform/graphics/freetype"
-    "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
-    "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
     "${WEBCORE_DIR}/platform/graphics/opengl"
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/wayland"
@@ -87,27 +85,15 @@
     platform/graphics/GraphicsContext3DPrivate.cpp
 
     platform/graphics/cairo/BackingStoreBackendCairoX11.cpp
-    platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
 
     platform/graphics/egl/GLContextEGL.cpp
     platform/graphics/egl/GLContextEGLWayland.cpp
     platform/graphics/egl/GLContextEGLX11.cpp
 
-    platform/graphics/freetype/FontCacheFreeType.cpp
-    platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
-    platform/graphics/freetype/FontPlatformDataFreeType.cpp
-    platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
-    platform/graphics/freetype/SimpleFontDataFreeType.cpp
-
     platform/graphics/glx/GLContextGLX.cpp
 
     platform/graphics/gstreamer/ImageGStreamerCairo.cpp
 
-    platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
-    platform/graphics/harfbuzz/HarfBuzzFace.cpp
-    platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
-    platform/graphics/harfbuzz/HarfBuzzShaper.cpp
-
     platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
     platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
     platform/graphics/opengl/TemporaryOpenGLSetting.cpp
@@ -222,8 +208,6 @@
     ${ATK_LIBRARIES}
     ${CAIRO_LIBRARIES}
     ${ENCHANT_LIBRARIES}
-    ${FONTCONFIG_LIBRARIES}
-    ${FREETYPE2_LIBRARIES}
     ${GEOCLUE_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
     ${GLIB_GMODULE_LIBRARIES}
@@ -230,7 +214,6 @@
     ${GLIB_GOBJECT_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${GUDEV_LIBRARIES}
-    ${HARFBUZZ_LIBRARIES}
     ${LIBGCRYPT_LIBRARIES}
     ${LIBSECRET_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
@@ -253,12 +236,10 @@
     ${ATK_INCLUDE_DIRS}
     ${CAIRO_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
-    ${FREETYPE2_INCLUDE_DIRS}
     ${GEOCLUE_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
     ${GUDEV_INCLUDE_DIRS}
-    ${HARFBUZZ_INCLUDE_DIRS}
     ${LIBGCRYPT_INCLUDE_DIRS}
     ${LIBSECRET_INCLUDE_DIRS}
     ${LIBSOUP_INCLUDE_DIRS}

Modified: trunk/Source/WebCore/PlatformWPE.cmake (217507 => 217508)


--- trunk/Source/WebCore/PlatformWPE.cmake	2017-05-26 21:33:15 UTC (rev 217507)
+++ trunk/Source/WebCore/PlatformWPE.cmake	2017-05-26 21:41:19 UTC (rev 217508)
@@ -1,4 +1,5 @@
 include(platform/Cairo.cmake)
+include(platform/FreeType.cmake)
 include(platform/GStreamer.cmake)
 include(platform/ImageDecoders.cmake)
 include(platform/Linux.cmake)
@@ -32,10 +33,7 @@
     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
     "${WEBCORE_DIR}/platform/graphics/egl"
     "${WEBCORE_DIR}/platform/graphics/glx"
-    "${WEBCORE_DIR}/platform/graphics/freetype"
     "${WEBCORE_DIR}/platform/graphics/gstreamer"
-    "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
-    "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
     "${WEBCORE_DIR}/platform/graphics/opengl"
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/wpe"
@@ -82,21 +80,8 @@
     platform/graphics/PlatformDisplay.cpp
     platform/graphics/WOFFFileFormat.cpp
 
-    platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
-
     platform/graphics/egl/GLContextEGL.cpp
 
-    platform/graphics/freetype/FontCacheFreeType.cpp
-    platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
-    platform/graphics/freetype/FontPlatformDataFreeType.cpp
-    platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
-    platform/graphics/freetype/SimpleFontDataFreeType.cpp
-
-    platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
-    platform/graphics/harfbuzz/HarfBuzzFace.cpp
-    platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
-    platform/graphics/harfbuzz/HarfBuzzShaper.cpp
-
     platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
     platform/graphics/opengl/Extensions3DOpenGLES.cpp
     platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
@@ -175,14 +160,11 @@
 list(APPEND WebCore_LIBRARIES
     ${CAIRO_LIBRARIES}
     ${EGL_LIBRARIES}
-    ${FONTCONFIG_LIBRARIES}
-    ${FREETYPE2_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
     ${GLIB_GMODULE_LIBRARIES}
     ${GLIB_GOBJECT_LIBRARIES}
     ${GLIB_LIBRARIES}
     ${GNUTLS_LIBRARIES}
-    ${HARFBUZZ_LIBRARIES}
     ${ICU_LIBRARIES}
     ${LIBGCRYPT_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
@@ -195,11 +177,8 @@
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${CAIRO_INCLUDE_DIRS}
     ${EGL_INCLUDE_DIRS}
-    ${FONTCONFIG_INCLUDE_DIRS}
-    ${FREETYPE2_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
     ${GNUTLS_INCLUDE_DIRS}
-    ${HARFBUZZ_INCLUDE_DIRS}
     ${ICU_INCLUDE_DIRS}
     ${LIBGCRYPT_INCLUDE_DIRS}
     ${LIBSOUP_INCLUDE_DIRS}

Added: trunk/Source/WebCore/platform/FreeType.cmake (0 => 217508)


--- trunk/Source/WebCore/platform/FreeType.cmake	                        (rev 0)
+++ trunk/Source/WebCore/platform/FreeType.cmake	2017-05-26 21:41:19 UTC (rev 217508)
@@ -0,0 +1,33 @@
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+    ${FONTCONFIG_INCLUDE_DIRS}
+    ${FREETYPE2_INCLUDE_DIRS}
+    ${HARFBUZZ_INCLUDE_DIRS}
+    "${WEBCORE_DIR}/platform/graphics/freetype"
+    "${WEBCORE_DIR}/platform/graphics/harfbuzz"
+)
+
+list(APPEND WebCore_SOURCES
+    platform/graphics/freetype/FontCacheFreeType.cpp
+    platform/graphics/freetype/FontCustomPlatformDataFreeType.cpp
+    platform/graphics/freetype/FontPlatformDataFreeType.cpp
+    platform/graphics/freetype/GlyphPageTreeNodeFreeType.cpp
+    platform/graphics/freetype/SimpleFontDataFreeType.cpp
+
+    platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
+    platform/graphics/harfbuzz/HarfBuzzFace.cpp
+    platform/graphics/harfbuzz/HarfBuzzShaper.cpp
+)
+
+if (USE_CAIRO)
+    list(APPEND WebCore_SOURCES
+        platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
+
+        platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
+    )
+endif ()
+
+list(APPEND WebCore_LIBRARIES
+    ${FONTCONFIG_LIBRARIES}
+    ${FREETYPE2_LIBRARIES}
+    ${HARFBUZZ_LIBRARIES}
+)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to