Title: [264236] trunk
- Revision
- 264236
- Author
- hironori.fu...@sony.com
- Date
- 2020-07-10 13:04:20 -0700 (Fri, 10 Jul 2020)
Log Message
[WinCairo] WOFF2 font support
https://bugs.webkit.org/show_bug.cgi?id=214174
Reviewed by Per Arne Vollan.
.:
* Source/cmake/OptionsWinCairo.cmake: Unmarked fast/text/woff2-totalsfntsize.html and fast/text/woff2.html.
Source/WebCore:
* PlatformWinCairo.cmake: Added additional libraries for static WOFF2 library to WebCore_LIBRARIES.
* platform/graphics/win/FontCustomPlatformDataCairo.cpp:
(WebCore::FontCustomPlatformData::supportsFormat): Added woff2.
Modified Paths
Diff
Modified: trunk/ChangeLog (264235 => 264236)
--- trunk/ChangeLog 2020-07-10 19:56:28 UTC (rev 264235)
+++ trunk/ChangeLog 2020-07-10 20:04:20 UTC (rev 264236)
@@ -1,3 +1,12 @@
+2020-07-10 Don Olmstead <don.olmst...@sony.com> and Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo] WOFF2 font support
+ https://bugs.webkit.org/show_bug.cgi?id=214174
+
+ Reviewed by Per Arne Vollan.
+
+ * Source/cmake/OptionsWinCairo.cmake: Unmarked fast/text/woff2-totalsfntsize.html and fast/text/woff2.html.
+
2020-07-10 Xabier Rodriguez Calvar <calva...@igalia.com>
[GStreamer][EME][OpenCDM] Implement OpenCDM support
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (264235 => 264236)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2020-07-10 19:56:28 UTC (rev 264235)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2020-07-10 20:04:20 UTC (rev 264236)
@@ -2033,8 +2033,6 @@
fast/text/whitespace/pre-wrap-015.html [ ImageOnlyFailure ]
fast/text/whitespace/pre-wrap-016.html [ ImageOnlyFailure ]
fast/text/whitespace/tab-character-basics.html [ Failure ]
-fast/text/woff2-totalsfntsize.html [ ImageOnlyFailure ]
-fast/text/woff2.html [ ImageOnlyFailure ]
fast/text/word-break-break-all-010.html [ ImageOnlyFailure ]
fast/text/word-break-break-all-015.html [ ImageOnlyFailure ]
fast/text/word-space-monospace.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (264235 => 264236)
--- trunk/Source/WebCore/ChangeLog 2020-07-10 19:56:28 UTC (rev 264235)
+++ trunk/Source/WebCore/ChangeLog 2020-07-10 20:04:20 UTC (rev 264236)
@@ -1,3 +1,14 @@
+2020-07-10 Don Olmstead <don.olmst...@sony.com> and Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo] WOFF2 font support
+ https://bugs.webkit.org/show_bug.cgi?id=214174
+
+ Reviewed by Per Arne Vollan.
+
+ * PlatformWinCairo.cmake: Added additional libraries for static WOFF2 library to WebCore_LIBRARIES.
+ * platform/graphics/win/FontCustomPlatformDataCairo.cpp:
+ (WebCore::FontCustomPlatformData::supportsFormat): Added woff2.
+
2020-07-10 Chris Fleizach <cfleiz...@apple.com>
AX: iOS VoiceOver should support definition lists
Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (264235 => 264236)
--- trunk/Source/WebCore/PlatformWinCairo.cmake 2020-07-10 19:56:28 UTC (rev 264235)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2020-07-10 20:04:20 UTC (rev 264236)
@@ -57,6 +57,15 @@
target_link_options(WebCore PUBLIC /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll)
+if (USE_WOFF2)
+ # The WOFF2 libraries don't compile as DLLs on Windows, so add in
+ # the additional libraries WOFF2::dec requires
+ list(APPEND WebCore_LIBRARIES
+ WOFF2::common
+ brotlidec
+ )
+endif ()
+
list(APPEND WebCoreTestSupport_LIBRARIES
Cairo::Cairo
shlwapi
Modified: trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp (264235 => 264236)
--- trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp 2020-07-10 19:56:28 UTC (rev 264235)
+++ trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp 2020-07-10 20:04:20 UTC (rev 264236)
@@ -98,6 +98,9 @@
{
return equalLettersIgnoringASCIICase(format, "truetype")
|| equalLettersIgnoringASCIICase(format, "opentype")
+#if USE(WOFF2)
+ || equalLettersIgnoringASCIICase(format, "woff2")
+#endif
|| equalLettersIgnoringASCIICase(format, "woff");
}
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (264235 => 264236)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2020-07-10 19:56:28 UTC (rev 264235)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2020-07-10 20:04:20 UTC (rev 264236)
@@ -26,6 +26,11 @@
SET_AND_EXPOSE_TO_BUILD(USE_OPENJPEG ON)
endif ()
+find_package(WOFF2 1.0.2 COMPONENTS dec)
+if (WOFF2_FOUND)
+ SET_AND_EXPOSE_TO_BUILD(USE_WOFF2 ON)
+endif ()
+
find_package(WebP COMPONENTS demux)
if (WebP_FOUND)
SET_AND_EXPOSE_TO_BUILD(USE_WEBP ON)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
