Changeset 230411 in webkit

Timestamp:

Apr 9, 2018 5:59:05 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r229866 - [WPE] Enable WOFF2 support
​https://bugs.webkit.org/show_bug.cgi?id=178158

Reviewed by Frédéric Wang.

.:

• Source/cmake/OptionsWPE.cmake: Add needed logic to detect the Brotli and WOFF2 libraries.

Tools:

• wpe/jhbuild.modules: Add "brotli" and "woff2" to the JHBuild moduleset.

LayoutTests:

• platform/wpe/TestExpectations: Unskip the fast/text/woff2.html and fast/text/woff2-totalsfntsize.html

Location:

releases/WebKitGTK/webkit-2.20

Files:

• ChangeLog (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wpe/TestExpectations (modified) (1 diff)
• Source/cmake/OptionsWPE.cmake (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/wpe/jhbuild.modules (modified) (3 diffs)

releases/WebKitGTK/webkit-2.20/ChangeLog

@@ +1 @@
+2018-03-22  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Enable WOFF2 support
+        https://bugs.webkit.org/show_bug.cgi?id=178158
+
+        Reviewed by Frédéric Wang.
+
+        * Source/cmake/OptionsWPE.cmake: Add needed logic to detect the Brotli and WOFF2 libraries.
+
 2018-03-12  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.20/LayoutTests/ChangeLog

@@ +1 @@
+2018-03-22  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Enable WOFF2 support
+        https://bugs.webkit.org/show_bug.cgi?id=178158
+
+        Reviewed by Frédéric Wang.
+
+        * platform/wpe/TestExpectations: Unskip the fast/text/woff2.html and fast/text/woff2-totalsfntsize.html
+
 2018-03-09  Nan Wang  <n_wang@apple.com>
 

releases/WebKitGTK/webkit-2.20/LayoutTests/platform/wpe/TestExpectations

@@ -477 +477 @@
 Bug(WPE) fast/table [ Skip ]
 Bug(WPE) fast/text [ Skip ]
+Bug(WPE) fast/text/woff2-totalsfntsize.html [ Pass ]
+Bug(WPE) fast/text/woff2.html [ Pass ]
 Bug(WPE) fast/text-autosizing [ Skip ]
 Bug(WPE) fast/visual-viewport [ Skip ]

releases/WebKitGTK/webkit-2.20/Source/cmake/OptionsWPE.cmake

@@ -33 +33 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
+
+# Public options specific to the WPE port. Do not add any options here unless
+# there is a strong reason we should support changing the value of the option,
+# and the option is not relevant to any other WebKit ports.
+WEBKIT_OPTION_DEFINE(USE_WOFF2 "Whether to enable support for WOFF2 Web Fonts." PUBLIC ON)
 
 # Private options specific to the WPE port.
@@ -71 +76 @@
 find_package(WPEBackend REQUIRED)
 find_package(ZLIB REQUIRED)
+
+if (USE_WOFF2)
+    find_package(WOFF2Dec 1.0.2)
+    if (NOT WOFF2DEC_FOUND)
+        message(FATAL_ERROR "liwoff2dec is needed for USE_WOFF2.")
+    endif ()
+endif ()
 
 if (ENABLE_ACCELERATED_2D_CANVAS)

releases/WebKitGTK/webkit-2.20/Tools/ChangeLog

@@ +1 @@
+2018-03-22  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Enable WOFF2 support
+        https://bugs.webkit.org/show_bug.cgi?id=178158
+
+        Reviewed by Frédéric Wang.
+
+        * wpe/jhbuild.modules: Add "brotli" and "woff2" to the JHBuild moduleset.
+
 2018-03-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Tools/wpe/jhbuild.modules

@@ -8 +8 @@
   <metamodule id="webkitwpe-testing-dependencies">
     <dependencies>
+      <dep package="brotli"/>
       <dep package="glib"/>
       <dep package="libsoup"/>
@@ -18 +19 @@
       <dep package="xkbcommon"/>
       <dep package="webkit-gstreamer-testing-dependencies"/>
+      <dep package="woff2"/>
       <dep package="wpe"/>
       <dep package="wpe-mesa"/>
@@ -47 +49 @@
       href="https://www.gnupg.org/ftp/gcrypt/"/>
 
+  <cmake id="brotli">
+    <branch repo="github.com" module="google/brotli.git" checkoutdir="brotli" tag="v1.0.1"/>
+  </cmake>
+
+  <cmake id="woff2">
+    <branch repo="github.com" module="google/woff2.git" checkoutdir="woff2" tag="v1.0.2"/>
+    <dependencies>
+      <dep package="brotli"/>
+    </dependencies>
+  </cmake>
+
   <autotools id="libffi" autogen-sh="configure">
     <branch module="libffi/libffi-3.0.10.tar.gz" version="3.0.10"