Attachment 360852 Details for Bug 194148 – Patch

[patch] Patch

wpe-font-variations.diff (text/plain), 6.05 KB, created by Carlos Garcia Campos on 2019-02-01 02:30:19 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-02-01 02:30:19 PST

Size: 6.05 KB

patch

obsolete

>diff --git a/ChangeLog b/ChangeLog
>index a69b7ba021e..b450d9bf163 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-02-01  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [WPE] Enable font variations
>+        https://bugs.webkit.org/show_bug.cgi?id=194148
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Enable variation fonts when required dependencies are available.
>+
>+        * Source/cmake/OptionsWPE.cmake:
>+
> 2019-01-24  Guillaume Emont  <guijemont@igalia.com>
> 
>         [JSC] Reenable baseline JIT on mips
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 9532d87c537..8881f9ea5d7 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-02-01  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [WPE] Enable font variations
>+        https://bugs.webkit.org/show_bug.cgi?id=194148
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/wpe/TestExpectations:
>+
> 2019-01-31  Megan Gardner  <megan_gardner@apple.com>
> 
>         Don't insert spaces at the beginning of a newline when using smart-copy-paste
>diff --git a/LayoutTests/platform/wpe/TestExpectations b/LayoutTests/platform/wpe/TestExpectations
>index 4115c361ba3..bec1640e5e3 100644
>--- a/LayoutTests/platform/wpe/TestExpectations
>+++ b/LayoutTests/platform/wpe/TestExpectations
>@@ -609,6 +609,9 @@ imported/w3c/web-platform-tests/css/selectors/selector-placeholder-shown-type-ch
> 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/153708 http/tests/cache/disk-cache/disk-cache-last-modified.html [
> 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 ]
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index 7ea7540c240..58ed3feb45e 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -12,6 +12,24 @@ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to
> 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 @@ if (DEVELOPER_MODE)
>     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)

Flags:

zan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 194148: 360852