Title: [240847] trunk
- Revision
- 240847
- Author
- carlo...@webkit.org
- Date
- 2019-02-01 06:35:08 -0800 (Fri, 01 Feb 2019)
Log Message
[WPE] Enable font variations
https://bugs.webkit.org/show_bug.cgi?id=194148
Reviewed by Žan Doberšek.
.:
Enable variation fonts when required dependencies are available.
* Source/cmake/OptionsWPE.cmake:
LayoutTests:
* platform/wpe/TestExpectations:
Modified Paths
Diff
Modified: trunk/ChangeLog (240846 => 240847)
--- trunk/ChangeLog 2019-02-01 14:33:15 UTC (rev 240846)
+++ trunk/ChangeLog 2019-02-01 14:35:08 UTC (rev 240847)
@@ -1,3 +1,14 @@
+2019-02-01 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [WPE] Enable font variations
+ https://bugs.webkit.org/show_bug.cgi?id=194148
+
+ Reviewed by Žan Doberšek.
+
+ Enable variation fonts when required dependencies are available.
+
+ * Source/cmake/OptionsWPE.cmake:
+
2019-01-24 Guillaume Emont <guijem...@igalia.com>
[JSC] Reenable baseline JIT on mips
Modified: trunk/LayoutTests/ChangeLog (240846 => 240847)
--- trunk/LayoutTests/ChangeLog 2019-02-01 14:33:15 UTC (rev 240846)
+++ trunk/LayoutTests/ChangeLog 2019-02-01 14:35:08 UTC (rev 240847)
@@ -1,5 +1,14 @@
2019-02-01 Carlos Garcia Campos <cgar...@igalia.com>
+ [WPE] Enable font variations
+ https://bugs.webkit.org/show_bug.cgi?id=194148
+
+ Reviewed by Žan Doberšek.
+
+ * platform/wpe/TestExpectations:
+
+2019-02-01 Carlos Garcia Campos <cgar...@igalia.com>
+
ComplexText: Test fast/text/word-space-nbsp.html fails when using complex text path
https://bugs.webkit.org/show_bug.cgi?id=193279
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (240846 => 240847)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2019-02-01 14:33:15 UTC (rev 240846)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2019-02-01 14:35:08 UTC (rev 240847)
@@ -609,6 +609,9 @@
imported/w3c/web-platform-tests/css/selectors/selector-read-write-type-change-002.html [ Pass ]
imported/w3c/web-platform-tests/css/selectors/selector-required-type-change-002.html [ Pass ]
+# Font variations
+fast/text/variations [ Pass ]
+
#////////////////////////////////////////////////////////////////////////////////////////
# 5. TESTS CRASHING
#////////////////////////////////////////////////////////////////////////////////////////
@@ -810,16 +813,10 @@
webkit.org/b/172274 http/tests/cache/disk-cache/disk-cache-media-small.html [ Failure ]
# Font variations
-Bug(WPE) animations/font-variations/font-stretch.html [ Timeout ]
-Bug(WPE) legacy-animation-engine/animations/font-variations/font-stretch.html [ Timeout ]
-Bug(WPE) animations/font-variations/font-style.html [ Timeout ]
-Bug(WPE) legacy-animation-engine/animations/font-variations/font-style.html [ Timeout ]
-Bug(WPE) animations/font-variations/font-variation-settings.html [ Failure ]
-Bug(WPE) legacy-animation-engine/animations/font-variations/font-variation-settings.html [ Failure ]
-Bug(WPE) animations/font-variations/font-variation-settings-order.html [ Failure ]
-Bug(WPE) legacy-animation-engine/animations/font-variations/font-variation-settings-order.html [ Failure ]
-Bug(WPE) animations/font-variations/font-variation-settings-unlike.html [ Failure ]
-Bug(WPE) legacy-animation-engine/animations/font-variations/font-variation-settings-unlike.html [ Failure ]
+webkit.org/b/162815 fast/text/variations/font-face-clamp.html [ ImageOnlyFailure ]
+webkit.org/b/162815 fast/text/variations/font-selection-properties.html [ ImageOnlyFailure ]
+webkit.org/b/162815 fast/text/variations/skia-postscript-name.html [ ImageOnlyFailure ]
+
# Unknown
webkit.org/b/120839 animations/cross-fade-background-image.html [ ImageOnlyFailure ]
webkit.org/b/120839 legacy-animation-engine/animations/cross-fade-background-image.html [ ImageOnlyFailure ]
Modified: trunk/Source/cmake/OptionsWPE.cmake (240846 => 240847)
--- trunk/Source/cmake/OptionsWPE.cmake 2019-02-01 14:33:15 UTC (rev 240846)
+++ trunk/Source/cmake/OptionsWPE.cmake 2019-02-01 14:35:08 UTC (rev 240847)
@@ -12,6 +12,24 @@
set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
+find_package(Cairo 1.10.2 REQUIRED)
+find_package(Fontconfig 2.8.0 REQUIRED)
+find_package(Freetype 2.4.2 REQUIRED)
+find_package(GLIB 2.40.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
+find_package(HarfBuzz 0.9.18 REQUIRED)
+find_package(ICU REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(LibEpoxy 1.4.0 REQUIRED)
+find_package(LibGcrypt 1.6.0 REQUIRED)
+find_package(LibSoup 2.42.0 REQUIRED)
+find_package(LibXml2 2.8.0 REQUIRED)
+find_package(PNG REQUIRED)
+find_package(Sqlite REQUIRED)
+find_package(Threads REQUIRED)
+find_package(WebP REQUIRED)
+find_package(WPE REQUIRED)
+find_package(ZLIB REQUIRED)
+
WEBKIT_OPTION_BEGIN()
include(GStreamerDefinitions)
@@ -65,28 +83,18 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
endif ()
+# Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
+if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
+ AND ("${PC_FONTCONFIG_VERSION}" VERSION_GREATER "2.13.0" OR "${PC_FONTCONFIG_VERSION}" STREQUAL "2.13.0")
+ AND ("${FREETYPE_VERSION_STRING}" VERSION_GREATER "2.9.0" OR "${FREETYPE_VERSION_STRING}" STREQUAL "2.9.0")
+ AND ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "1.4.2" OR "${PC_HARFBUZZ_VERSION}" STREQUAL "1.4.2"))
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
+endif ()
+
include(GStreamerDependencies)
WEBKIT_OPTION_END()
-find_package(Cairo 1.10.2 REQUIRED)
-find_package(Fontconfig 2.8.0 REQUIRED)
-find_package(Freetype 2.4.2 REQUIRED)
-find_package(GLIB 2.40.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
-find_package(HarfBuzz 0.9.18 REQUIRED)
-find_package(ICU REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(LibEpoxy 1.4.0 REQUIRED)
-find_package(LibGcrypt 1.6.0 REQUIRED)
-find_package(LibSoup 2.42.0 REQUIRED)
-find_package(LibXml2 2.8.0 REQUIRED)
-find_package(PNG REQUIRED)
-find_package(Sqlite REQUIRED)
-find_package(Threads REQUIRED)
-find_package(WebP REQUIRED)
-find_package(WPE REQUIRED)
-find_package(ZLIB REQUIRED)
-
if (USE_OPENJPEG)
find_package(OpenJPEG)
if (NOT OpenJPEG_FOUND)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
