- Revision
- 223042
- Author
- [email protected]
- Date
- 2017-10-09 02:08:49 -0700 (Mon, 09 Oct 2017)
Log Message
Remove WOFF2 from Source/ThirdParty.
https://bugs.webkit.org/show_bug.cgi?id=177862
Patch by Frederic Wang <[email protected]> on 2017-10-05
Reviewed by Michael Catanzaro.
.:
* Source/CMakeLists.txt: Do not build the woff2 source.
* Source/cmake/FindWOFF2Dec.cmake: Added. New cmake module for woff2.
* Source/cmake/OptionsGTK.cmake: Load the woff2 package.
Source/ThirdParty:
* woff2/CMakeLists.txt: Removed.
* woff2/LICENSE: Removed.
* woff2/README.webkit: Removed.
* woff2/include/woff2/decode.h: Removed.
* woff2/include/woff2/encode.h: Removed.
* woff2/include/woff2/output.h: Removed.
* woff2/src/buffer.h: Removed.
* woff2/src/convert_woff2ttf_*.cc: Removed.
* woff2/src/file.h: Removed.
* woff2/src/font.cc: Removed.
* woff2/src/font.h: Removed.
* woff2/src/glyph.cc: Removed.
* woff2/src/glyph.h: Removed.
* woff2/src/normalize.cc: Removed.
* woff2/src/normalize.h: Removed.
* woff2/src/port.h: Removed.
* woff2/src/round.h: Removed.
* woff2/src/store_bytes.h: Removed.
* woff2/src/table_tags.cc: Removed.
* woff2/src/table_tags.h: Removed.
* woff2/src/transform.cc: Removed.
* woff2/src/transform.h: Removed.
* woff2/src/variable_length.cc: Removed.
* woff2/src/variable_length.h: Removed.
* woff2/src/woff2_common.cc: Removed.
* woff2/src/woff2_common.h: Removed.
* woff2/src/woff2_compress.cc: Removed.
* woff2/src/woff2_dec.cc: Removed.
* woff2/src/woff2_decompress.cc: Removed.
* woff2/src/woff2_enc.cc: Removed.
* woff2/src/woff2_info.cc: Removed.
* woff2/src/woff2_out.cc: Removed.
* woff2/update.sh: Removed.
Source/WebCore:
No new tests, already covered by existing tests.
* CMakeLists.txt: Use the system brotli/woff2 headers/libraries.
Tools:
* Scripts/webkitpy/style/checker.py: Remove woff2.
* gtk/jhbuild.modules: Add new jhbuild module for woff2.
Modified Paths
Added Paths
Removed Paths
- trunk/Source/ThirdParty/woff2/
Diff
Modified: trunk/ChangeLog (223041 => 223042)
--- trunk/ChangeLog 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/ChangeLog 2017-10-09 09:08:49 UTC (rev 223042)
@@ -1,3 +1,14 @@
+2017-10-05 Frederic Wang <[email protected]>
+
+ Remove WOFF2 from Source/ThirdParty.
+ https://bugs.webkit.org/show_bug.cgi?id=177862
+
+ Reviewed by Michael Catanzaro.
+
+ * Source/CMakeLists.txt: Do not build the woff2 source.
+ * Source/cmake/FindWOFF2Dec.cmake: Added. New cmake module for woff2.
+ * Source/cmake/OptionsGTK.cmake: Load the woff2 package.
+
2017-10-05 Carlos Alberto Lopez Perez <[email protected]>
Generate a compile error if release is built without compiler optimizations
Modified: trunk/Source/CMakeLists.txt (223041 => 223042)
--- trunk/Source/CMakeLists.txt 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/Source/CMakeLists.txt 2017-10-09 09:08:49 UTC (rev 223042)
@@ -17,10 +17,6 @@
add_subdirectory(ThirdParty/gtest)
endif ()
-if (USE_WOFF2)
- add_subdirectory(ThirdParty/woff2)
-endif ()
-
if (USE_XDGMIME)
add_subdirectory(ThirdParty/xdgmime)
endif ()
Modified: trunk/Source/ThirdParty/ChangeLog (223041 => 223042)
--- trunk/Source/ThirdParty/ChangeLog 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/Source/ThirdParty/ChangeLog 2017-10-09 09:08:49 UTC (rev 223042)
@@ -1,5 +1,46 @@
2017-10-05 Frederic Wang <[email protected]>
+ Remove WOFF2 from Source/ThirdParty.
+ https://bugs.webkit.org/show_bug.cgi?id=177862
+
+ Reviewed by Michael Catanzaro.
+
+ * woff2/CMakeLists.txt: Removed.
+ * woff2/LICENSE: Removed.
+ * woff2/README.webkit: Removed.
+ * woff2/include/woff2/decode.h: Removed.
+ * woff2/include/woff2/encode.h: Removed.
+ * woff2/include/woff2/output.h: Removed.
+ * woff2/src/buffer.h: Removed.
+ * woff2/src/convert_woff2ttf_*.cc: Removed.
+ * woff2/src/file.h: Removed.
+ * woff2/src/font.cc: Removed.
+ * woff2/src/font.h: Removed.
+ * woff2/src/glyph.cc: Removed.
+ * woff2/src/glyph.h: Removed.
+ * woff2/src/normalize.cc: Removed.
+ * woff2/src/normalize.h: Removed.
+ * woff2/src/port.h: Removed.
+ * woff2/src/round.h: Removed.
+ * woff2/src/store_bytes.h: Removed.
+ * woff2/src/table_tags.cc: Removed.
+ * woff2/src/table_tags.h: Removed.
+ * woff2/src/transform.cc: Removed.
+ * woff2/src/transform.h: Removed.
+ * woff2/src/variable_length.cc: Removed.
+ * woff2/src/variable_length.h: Removed.
+ * woff2/src/woff2_common.cc: Removed.
+ * woff2/src/woff2_common.h: Removed.
+ * woff2/src/woff2_compress.cc: Removed.
+ * woff2/src/woff2_dec.cc: Removed.
+ * woff2/src/woff2_decompress.cc: Removed.
+ * woff2/src/woff2_enc.cc: Removed.
+ * woff2/src/woff2_info.cc: Removed.
+ * woff2/src/woff2_out.cc: Removed.
+ * woff2/update.sh: Removed.
+
+2017-10-05 Frederic Wang <[email protected]>
+
Update Source/ThirdParty/woff2 to 22c256bc457777744ba14b7325a6e8e0e7dec91c
https://bugs.webkit.org/show_bug.cgi?id=177994
Modified: trunk/Source/WebCore/CMakeLists.txt (223041 => 223042)
--- trunk/Source/WebCore/CMakeLists.txt 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-10-09 09:08:49 UTC (rev 223042)
@@ -3659,8 +3659,8 @@
endif ()
if (USE_WOFF2)
- list(APPEND WebCore_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/woff2/include")
- list(APPEND WebCore_LIBRARIES woff2)
+ list(APPEND WebCore_INCLUDE_DIRECTORIES "${WOFF2DEC_INCLUDE_DIRS}")
+ list(APPEND WebCore_LIBRARIES "${BROTLIDEC_LIBRARIES}" "${WOFF2DEC_LIBRARIES}")
endif ()
if (USE_XDGMIME)
Modified: trunk/Source/WebCore/ChangeLog (223041 => 223042)
--- trunk/Source/WebCore/ChangeLog 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/Source/WebCore/ChangeLog 2017-10-09 09:08:49 UTC (rev 223042)
@@ -1,3 +1,14 @@
+2017-10-05 Frederic Wang <[email protected]>
+
+ Remove WOFF2 from Source/ThirdParty.
+ https://bugs.webkit.org/show_bug.cgi?id=177862
+
+ Reviewed by Michael Catanzaro.
+
+ No new tests, already covered by existing tests.
+
+ * CMakeLists.txt: Use the system brotli/woff2 headers/libraries.
+
2017-10-08 Darin Adler <[email protected]>
Update HTMLOListElement.start to behavior from latest HTML specification
Added: trunk/Source/cmake/FindWOFF2Dec.cmake (0 => 223042)
--- trunk/Source/cmake/FindWOFF2Dec.cmake (rev 0)
+++ trunk/Source/cmake/FindWOFF2Dec.cmake 2017-10-09 09:08:49 UTC (rev 223042)
@@ -0,0 +1,53 @@
+# - Try to find WOFF2Dec.
+# Once done, this will define
+#
+# WOFF2DEC_FOUND - system has WOFF2Dec.
+# WOFF2DEC_INCLUDE_DIRS - the WOFF2Dec include directories
+# WOFF2DEC_LIBRARIES - link these to use WOFF2Dec.
+#
+# Copyright (C) 2017 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(PC_WOFF2DEC libwoff2dec)
+
+find_path(WOFF2DEC_INCLUDE_DIRS
+ NAMES woff2/decode.h
+ HINTS ${PC_WOFF2DEC_INCLUDEDIR}
+)
+
+find_library(WOFF2DEC_LIBRARIES
+ NAMES woff2dec
+ HINTS ${PC_WOFF2DEC_LIBDIR}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(WOFF2Dec
+ REQUIRED_VARS WOFF2DEC_INCLUDE_DIRS WOFF2DEC_LIBRARIES
+ FOUND_VAR WOFF2DEC_FOUND
+ VERSION_VAR PC_WOFF2DEC_VERSION)
+
+mark_as_advanced(
+ WOFF2DEC_INCLUDE_DIRS
+ WOFF2DEC_LIBRARIES
+)
Modified: trunk/Source/cmake/OptionsGTK.cmake (223041 => 223042)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-10-09 09:08:49 UTC (rev 223042)
@@ -387,6 +387,10 @@
if (NOT BROTLIDEC_FOUND)
message(FATAL_ERROR "librotlidec is needed for USE_WOFF2.")
endif ()
+ find_package(WOFF2Dec 1.0.1)
+ if (NOT WOFF2DEC_FOUND)
+ message(FATAL_ERROR "liwoff2dec is needed for USE_WOFF2.")
+ endif ()
endif ()
# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
Modified: trunk/Tools/ChangeLog (223041 => 223042)
--- trunk/Tools/ChangeLog 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/Tools/ChangeLog 2017-10-09 09:08:49 UTC (rev 223042)
@@ -1,3 +1,13 @@
+2017-10-05 Frederic Wang <[email protected]>
+
+ Remove WOFF2 from Source/ThirdParty.
+ https://bugs.webkit.org/show_bug.cgi?id=177862
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/webkitpy/style/checker.py: Remove woff2.
+ * gtk/jhbuild.modules: Add new jhbuild module for woff2.
+
2017-10-08 Sam Weinig <[email protected]>
It should be possible to create a ListHashSet with a std::initializer_list.
Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (223041 => 223042)
--- trunk/Tools/Scripts/webkitpy/style/checker.py 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2017-10-09 09:08:49 UTC (rev 223042)
@@ -213,7 +213,6 @@
#
([os.path.join('webkitpy', 'thirdparty'),
os.path.join('Source', 'ThirdParty', 'ANGLE'),
- os.path.join('Source', 'ThirdParty', 'woff2'),
os.path.join('Source', 'ThirdParty', 'xdgmime')],
["-",
"+pep8/W191", # Tabs
Modified: trunk/Tools/gtk/jhbuild.modules (223041 => 223042)
--- trunk/Tools/gtk/jhbuild.modules 2017-10-09 04:08:33 UTC (rev 223041)
+++ trunk/Tools/gtk/jhbuild.modules 2017-10-09 09:08:49 UTC (rev 223042)
@@ -8,6 +8,7 @@
<metamodule id="webkitgtk-testing-dependencies">
<dependencies>
<dep package="brotli"/>
+ <dep package="woff2"/>
<dep package="cairo"/>
<dep package="fonts"/>
<dep package="dicts"/>
@@ -84,6 +85,13 @@
<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.1"/>
+ <dependencies>
+ <dep package="brotli"/>
+ </dependencies>
+ </cmake>
+
<autotools id="cairo"
autogen-sh="configure">
<if condition-set="linux">
