https://bugs.webkit.org/show_bug.cgi?id=150830
Reviewed by Zalan Bujtas.
Source/WebCore:
On platforms which support it, WebKit only needs to recognize WOFF2.
Test: fast/text/woff2.html
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::supportsFormat):
LayoutTests:
* platform/mac/TestExpectations: Disable the test on Operating Systems which don't support WOFF2.
* fast/text/resources/ahem.woff2: Added.
* fast/text/woff2-expected.html: Added.
* fast/text/woff2.html: Added.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191934
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2015-11-02 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Support WOFF2
+ https://bugs.webkit.org/show_bug.cgi?id=150830
+
+ Reviewed by Zalan Bujtas.
+
+ * platform/mac/TestExpectations: Disable the test on Operating Systems which don't support WOFF2.
+ * fast/text/resources/ahem.woff2: Added.
+ * fast/text/woff2-expected.html: Added.
+ * fast/text/woff2.html: Added.
+
2015-11-02 Nan Wang <n_wang@apple.com>
AX: Add support for ARIA 1.1 attribute 'aria-modal' for dialog and alertdialog
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "webfont";
+ src: url("../../resources/Ahem.ttf") format("truetype");
+}
+#test {
+ font: 40px "webfont";
+}
+</style>
+</head>
+<body>
+This test makes sure WOFF2 renders as expected. The test passes if you see a horizontal black rectangle below.
+<div id="test">Hello</div>
+</body>
+</html>
--- /dev/null
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "webfont";
+ src: url("resources/ahem.woff2") format("woff2");
+}
+#test {
+ font: 40px "webfont";
+}
+</style>
+</head>
+<body>
+This test makes sure WOFF2 renders as expected. The test passes if you see a horizontal black rectangle below.
+<div id="test">Hello</div>
+</body>
+</html>
webkit.org/b/147933 streams/reference-implementation/writable-stream-abort.html [ Pass Failure ]
webkit.org/b/150806 imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm [ Pass Failure ]
-webkit.org/b/150823 imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm [ Pass Failure ]
\ No newline at end of file
+webkit.org/b/150823 imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm [ Pass Failure ]
+
+# WOFF2 is only supported on certain Operating Systems.
+webkit.org/b/150830 [ Mavericks Yosemite ElCapitan ] fast/text/woff2.html [ Failure ]
+2015-11-02 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Support WOFF2
+ https://bugs.webkit.org/show_bug.cgi?id=150830
+
+ Reviewed by Zalan Bujtas.
+
+ On platforms which support it, WebKit only needs to recognize WOFF2.
+
+ Test: fast/text/woff2.html
+
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::supportsFormat):
+
2015-11-02 Nan Wang <n_wang@apple.com>
AX: Add support for ARIA 1.1 attribute 'aria-modal' for dialog and alertdialog
bool FontCustomPlatformData::supportsFormat(const String& format)
{
- return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype") || equalIgnoringCase(format, "woff");
+ return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "opentype")
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+ || equalIgnoringCase(format, "woff2")
+#endif
+ || equalIgnoringCase(format, "woff");
}
}