Title: [217241] trunk
- Revision
- 217241
- Author
- mmaxfi...@apple.com
- Date
- 2017-05-22 13:12:43 -0700 (Mon, 22 May 2017)
Log Message
Enable the woff2-variations @font-face format identifier
https://bugs.webkit.org/show_bug.cgi?id=172425
Reviewed by Andreas Kling.
Source/WebCore:
We support woff2, and woff-variations, but not woff2-variations.
https://github.com/w3c/csswg-drafts/commit/5c914a8a0382734bd420090a89bc19b32e6c302d
Test: fast/text/variations/font-face-format-woff2.html
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::supportsFormat):
LayoutTests:
* fast/text/variations/font-face-format-woff2-expected.html: Added.
* fast/text/variations/font-face-format-woff2.html: Added.
* platform/mac/TestExpectations:
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (217240 => 217241)
--- trunk/LayoutTests/ChangeLog 2017-05-22 19:48:38 UTC (rev 217240)
+++ trunk/LayoutTests/ChangeLog 2017-05-22 20:12:43 UTC (rev 217241)
@@ -1,3 +1,14 @@
+2017-05-22 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Enable the woff2-variations @font-face format identifier
+ https://bugs.webkit.org/show_bug.cgi?id=172425
+
+ Reviewed by Andreas Kling.
+
+ * fast/text/variations/font-face-format-woff2-expected.html: Added.
+ * fast/text/variations/font-face-format-woff2.html: Added.
+ * platform/mac/TestExpectations:
+
2017-05-22 Simon Fraser <simon.fra...@apple.com>
Support transform-box to switch sizing box in SVG
Added: trunk/LayoutTests/fast/text/variations/font-face-format-woff2-expected.html (0 => 217241)
--- trunk/LayoutTests/fast/text/variations/font-face-format-woff2-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/font-face-format-woff2-expected.html 2017-05-22 20:12:43 UTC (rev 217241)
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "WebFont";
+ src: url("../../../resources/Ahem.otf") format("woff");
+}
+</style>
+</head>
+<body>
+This test passes of you see a black rectangle below.
+<div style="font-size: 36px;">
+<p style="font-family: 'WebFont';">Hello</p>
+</div>
+</body>
+</html>
Added: trunk/LayoutTests/fast/text/variations/font-face-format-woff2.html (0 => 217241)
--- trunk/LayoutTests/fast/text/variations/font-face-format-woff2.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/font-face-format-woff2.html 2017-05-22 20:12:43 UTC (rev 217241)
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "WebFont";
+ src: url("../../../resources/Ahem.otf") format("woff2-variations"), local("Helvetica");
+}
+</style>
+</head>
+<body>
+This test passes of you see a black rectangle below.
+<div style="font-size: 36px;">
+<p style="font-family: 'WebFont';">Hello</p>
+</div>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/mac/TestExpectations (217240 => 217241)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-05-22 19:48:38 UTC (rev 217240)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-05-22 20:12:43 UTC (rev 217241)
@@ -1237,6 +1237,7 @@
# WOFF2 is only supported on certain Operating Systems.
webkit.org/b/150830 [ Yosemite ElCapitan ] fast/text/woff2.html [ ImageOnlyFailure ]
+webkit.org/b/150830 [ Yosemite ElCapitan ] fast/text/variations/font-face-format-woff2.html [ ImageOnlyFailure ]
webkit.org/b/162668 fast/text/woff2-totalsfntsize.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (217240 => 217241)
--- trunk/Source/WebCore/ChangeLog 2017-05-22 19:48:38 UTC (rev 217240)
+++ trunk/Source/WebCore/ChangeLog 2017-05-22 20:12:43 UTC (rev 217241)
@@ -1,3 +1,18 @@
+2017-05-22 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Enable the woff2-variations @font-face format identifier
+ https://bugs.webkit.org/show_bug.cgi?id=172425
+
+ Reviewed by Andreas Kling.
+
+ We support woff2, and woff-variations, but not woff2-variations.
+ https://github.com/w3c/csswg-drafts/commit/5c914a8a0382734bd420090a89bc19b32e6c302d
+
+ Test: fast/text/variations/font-face-format-woff2.html
+
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::supportsFormat):
+
2017-05-22 Antoine Quint <grao...@apple.com>
[mac-wk1] LayoutTest media/modern-media-controls/airplay-button/airplay-button.html is a flaky timeout
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (217240 => 217241)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2017-05-22 19:48:38 UTC (rev 217240)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2017-05-22 20:12:43 UTC (rev 217241)
@@ -62,7 +62,10 @@
|| equalLettersIgnoringASCIICase(format, "opentype")
#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
|| equalLettersIgnoringASCIICase(format, "woff2")
+#if ENABLE(VARIATION_FONTS)
+ || equalLettersIgnoringASCIICase(format, "woff2-variations")
#endif
+#endif
#if ENABLE(VARIATION_FONTS)
|| equalLettersIgnoringASCIICase(format, "woff-variations")
|| equalLettersIgnoringASCIICase(format, "truetype-variations")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
