Diff
Modified: trunk/LayoutTests/ChangeLog (191933 => 191934)
--- trunk/LayoutTests/ChangeLog 2015-11-03 03:23:03 UTC (rev 191933)
+++ trunk/LayoutTests/ChangeLog 2015-11-03 03:52:16 UTC (rev 191934)
@@ -1,3 +1,15 @@
+2015-11-02 Myles C. Maxfield <mmaxfi...@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_w...@apple.com>
AX: Add support for ARIA 1.1 attribute 'aria-modal' for dialog and alertdialog
Added: trunk/LayoutTests/fast/text/resources/ahem.woff2 (0 => 191934)
--- trunk/LayoutTests/fast/text/resources/ahem.woff2 (rev 0)
+++ trunk/LayoutTests/fast/text/resources/ahem.woff2 2015-11-03 03:52:16 UTC (rev 191934)
@@ -0,0 +1,10 @@
+wOF2\x8CAd'B?FFTM `\x83Z \x84e
+\xDE8\xCE6$\x87 \x83H \x86Z\x85* 7?webfI6Q\xD4&J\xAA3\xD9\xD7\xEA^D\xD0խ\xA0-/x\xF1\xC2M/@\xF3u<p\xFF L \xAC\x89A<o\xF7_un\xF3}\xB3Z0\x95#F+2\x95B\x99\xD1\xE0\xC0\xBF\xD7KR\xC0\xB9X\x85>\xC8}HS5\x8C\x99:\x83Sg\x8Dݠ\xB56bl>\xA2\x99\xA3T(\x81J)\xAA\x89f*3\xF5$ږg\x9F\xB6\xDF;\x98y\x99\xE0\x97㷈\xCA jӋ\xF5L\xBAj\xC1K\xBCS\xADJ \xDA\xE6g\xA2\xF9a\xB2!"\xA5B_\xCF\xEB\xFF\xC2\xFE\xF1\xED ,\xAE7@ \xDB\xFF\xFF\xFB\xB9:{\x98T2? \x91C\xAC\xFF\xDF\xE9\xFB\xB3\xB7\xA1\xA2\xA1\xD3 E\xCC\xD22M,$j݆hi\xAAWr\xA4\xB2\xD9&\xE9\xCCP뮁\x85.\xC8D\xBFvHxu˻\xDExx\xD5a \xDE>\xE4-\xA5!ta \xE1k\xF9N\x80Ekq\x8A\xBC\xB8\xA9\xD8 Ĝ`\xE2\xEC\x92\xD4\x92\xBC\xC5\xF4|\xDC\xDFw!\xB3\x8C\xC06\xCEY]\xB2k\xAF\<\xDD\xEA݆$\xBCŀ]2'\x96\xAE\xBC\x8B1; ;<փvh\xD3i\xAE\x86g\xFEc NHϧO\x9B\xB6f2tX\xF0\x90b\xC0k\x8E\xBB\xFFuЩ1k\xDBT\xEC\x89\xF3{ B\xB5\xEAg[\xF7\x9FY\xEDͭ\xFE\xF8\xE5\xE6\xCB\xCA\xCB\xE2\x97 _\xCE~9\xF5\xE
5З\x8D/-_,\xFCʫ9 &Jʡ\x91\xB1\xFC^A\x96eU\xB7\xB4\xB5wtvu\xF7\xF4\xD2 \xCB\xF1\x82(Ɋ\xAA\xE9L\xCBv\\xCF\xC2(N>\xDF4ˋ\xB2\xAA\x9B\xB6\xEB\x87q\x9A\x97uۥ2\xB9B\xA9Rk\xB4:\xBD\xC1h2[\xAC6\xBB\xC3\xE9r{\xBC>
+C\xEF\\x97'\x92\xCCW\xCA\xD5z\xAD\xD1괻\xBDAhxt|lbjrnv~\xFA\xA3h\xFES\xE1\xF6UK\xE4\x97\xC0\xE0\xC0B\xA3\xA3\xB0\xEC$x\xF8\x84\xE9\xC88\xCBO\xFEL\x9Cqvbe\xF5\xFC\xE2\xE6\xF6\xF2j\xDA\xF2\xD3\xC0\xE7_\x8E\xFF\xE0#\xACY|\xEE@0\xE4\x8F\xC5\xBD)\x97\xC1\xFA\xB3:\xE0Ɓ\xE3&\xBCn\xA1\x89\xA0 I֡\xB3\x97Ѿf\xE0(QJ\x8F\xABLqw\xBB\x86^1\x94\\x92\xE1#4}\xE3\x80\xE7#\xE9\x8E~nRF\xA3dz%\x83\xB0M/K7\xDD\xF8\xC8u\xB51\xA4\x92[\xFC\xE7\xCE\xC0,\xC8\xFFn(\x89\xC2c4\xAF\x99R\xDE\xA8\xC6.t\xEC\xC1\xA3>J\xBD?S\\xA09/\xED <\xEE\xC2!*\xBD?;o];~\xAD\x93\xA9,ࣥi\xB7z-\xD6\xB2\xBC6E\xC8\xF3\xDB\xE1\xF4\xB2]\xB03,u\xA54\xAE\xCD(\xFA\xA11\x9F6fq n\x82$Kh\xD7\xF4\xDC]l"\x80\xCAg\xA2\xD5<\xB3JL\xF3\xB3\xD5#vj&\xA9d\x9B\xBB/C\xD9\xC6\xCEjJTD\xEDL\xE8\xE4\xF4\xA8]H x\xEC\xD2R\xB6\xEA=CJ\x97\xDEm \xB2\xDA\x86x\xA1T\xC9\xEA֊\xDE Sw \xB8aض&w\x9B\xB2\xB3\xC8\xEE\xEA\x8A3ʪ\xF8z =\xA7@zL\xEC=z\xDB\xEB\xD1\xFA:5i3\xDD \x98\xB0~M\xCC\xC5\xF3\xF
Bl\xCC\xF6ye+P/W\xBA\xE7\xD2\xF4\xA1ZQ[_/:\xCE\x9C9\xC7Š}\xC6ؓ\xD5,\x81\x92\xBAI\xE8 ̱M? 8+s\xF5\x82\xCD!s![Ԑ0[\xE4εD@\xA6\x96\xF4Z'sS\xDF\xF1<x\xB2\xDDA\xAB\x8FQ\xB4\xC3o">\x9F\xE6\xB0,6\xEFz\xBAРhR\x97\x95\xDEs#7\xFF\x94\xB7\x9F\xDC}\xE2\x91[ \xE9\xE4\x93\xCB\xCE+d\xE8\xE4tR\x97\xAE\xD5\xD7@ޓ\xCBrعO#\xFE\xCF\xF8Dv\xC3k\xE9\x8DnBw\xA8\x8D\xC7\xDE;\xB7g\xC7\xF7\x9A\x8E&ӡ4ϡ}\xE8\xE3\xC6OZ n:\x9B\x9AQ\xFC\x8C\xF5@q\xE5B\xDE{!\x99\xFD\xEC\xBE \x8F\xBC\xC42\xDC?v \xC3C\xD9\xCC\xD9 o\xF1\xAB\xF2\xF4\xDBf\x96ŧ\xC26Kz\x8F\xB32Y\x91\xFAPUf\xABW\xAB9 \xE1<\xC7\xF9\xC6\xB8z {\xCD~?\xF0\xC1"ַ\xBA\xE9\xAE\xE8#\xAA|}\xFF\x820\x87\xB6߀ \xF0u\xAE\x87n4\x9E&f\xDE\xDDkH\xBFV|\xD60\x8B\x9F·\xE6x \xDF\xF8\xB1q;\xB8\\xF9\x80W?\x8A\xEA$\xCD\xF4̿\xA3\xB9\xBC\xD1\xEF\xED\xFA\xB76\x84\xB0\xDD5o\xB1v{o\xF1_=Z\xE3\xF3_m\x90\xB0va\xED\xA3ܱj \xEEFn\x90\xFD\xD3\xCA\xFA&\xFD\x8A'\xBF \xE6e\x9B\xDF3\xB5\x82I\xD2L
7B\xF4\x8A+\xC0\xAB; \xA8\xA7M7*\xEFٜ\xC07wn\xC1$$C[\xB2\xD1RݞBy\x8B\xB8+F,\xD43pIW\xDC\xC7e\x9Ax\x84ˍĻ\a(~\xE5JuJ\xD2 \xD2\xC6\xF5:\x94\xFAh\x9F\x8C4܋\xD8i>\xF7nڊ\xBE\x8C%+\xDD_\xC1L\xA7\xE1\xA3\xCCX:_RV\xA2\xF0J#\x88W" LňCYiy9.JX \x98"\xA98MA\x82\x92\x9FB}\xD7\x9A\x8DK9\x80\xCD(\xE2 ڀ&\x83\x97T\xC4`\x96@\x9A\xBE\x82\xC6d\xD3+#Z\xC7y \x89^\x88#H`,C\x8EB+/\xB6\xA1\xC9\x8C\x80s\xE4\xBA $\x98\xEA6
+2CR\x82\x961\xD0A\xCCR\xA1Y#\xA5X -2ʐ]قJ^F{ی>C&c\xB3(:\x94a~p+\x82\x99\x81E\x92\x8B|\xE0hX&\xA9_0Ί\xC1u\x87\x87\xA8 \xE7\x99\xD10.\xB9f\xD9Dj\x82\xAEc\x9Dz\xA7\xF5L5\xA9 \xC9n\xA9\xCE\xD4\xC3\xD5+g\xA1d\x94T\x80кSp\xCDu\x9B\xAEy\xAA]\x9D\xE1\xD6\xF94\xB0b hr\xAA\xE2ᯤD\xDBU%`\xE6\xBB\xDBFh\xED\x9F\xE63\x8F\xFB7)2\x99\\xA1T\xA9\xB5\xB4\xEBЩK\xB7 G s\xDC '\x9Dr\xDAg\x9Ds\xDE]2
+\x8D7aҔi3f͙\xB7`ђe+\x9C'^\xB7aӖˮ\xB8\xDA!c\xDFp\xD3-\xB7\x89\x88IH\xC9\xC8)(\xA9\xA8ih\xE9\xE8\x99\x98YX\x8D\xCB`\xE7\xE0\xE4\xE2\xE6\xE1\xE5\xE3FD\xEEnv\x8B\x92\xDE9\xF9tԣp\x91;6\xB1(\xA3r)\xB7uOQ\xBBMן\xFD\xEF.\xBB\xB6+\x8C\x8E\xCB"\xB1\xE7CG>H|p\xE2\xD40\xA9\xFF\xAEt\xE5\xC2%\x99_~x(\xA2\xE2b\xB6i\xA5\xA5\xAE\x90\x8B\x9B\x97SP\xF4\x93QEYU]\xCD+&+-\xDF~\xCD1jލ\xDBhE[\xB4GGtFWtGO\xF4F_\xF4\xC7@ Ɛ'\xC6M\x99\xB6a¤M.\xBD\xF6\xDAr\x8C\xB8\xA3\xE5\xA2\xE5\xE5\xBF\xB6\xFBؕª\xE9s\x8E{\xA6Ά \x90R\xD6\xD3ue5\x90\x9C\xA4$\xA9ICZ\xD2i\xA8{h\x9E\xC1\xA49\xB5p \x97\xCF04\x91\xE5w\xC5\xE3S?^\xDF\xF9*\xD6¥\xF2D\xF4\xF2\xBE3\xFB\xCD?\xAC\xA2\xE7_\x9C\xC0\x94\xFE\x90\x9Dar~,Y\xDF8;jB\xB0\xD7h\x90\xE29\xC2YJ\xB7
\ No newline at end of file
Property changes on: trunk/LayoutTests/fast/text/resources/ahem.woff2
___________________________________________________________________
Added: svn:executable
Added: trunk/LayoutTests/fast/text/woff2-expected.html (0 => 191934)
--- trunk/LayoutTests/fast/text/woff2-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/woff2-expected.html 2015-11-03 03:52:16 UTC (rev 191934)
@@ -0,0 +1,18 @@
+<!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>
Added: trunk/LayoutTests/fast/text/woff2.html (0 => 191934)
--- trunk/LayoutTests/fast/text/woff2.html (rev 0)
+++ trunk/LayoutTests/fast/text/woff2.html 2015-11-03 03:52:16 UTC (rev 191934)
@@ -0,0 +1,18 @@
+<!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>
Modified: trunk/LayoutTests/platform/mac/TestExpectations (191933 => 191934)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-11-03 03:23:03 UTC (rev 191933)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-11-03 03:52:16 UTC (rev 191934)
@@ -1354,4 +1354,7 @@
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 ]
Modified: trunk/Source/WebCore/ChangeLog (191933 => 191934)
--- trunk/Source/WebCore/ChangeLog 2015-11-03 03:23:03 UTC (rev 191933)
+++ trunk/Source/WebCore/ChangeLog 2015-11-03 03:52:16 UTC (rev 191934)
@@ -1,3 +1,17 @@
+2015-11-02 Myles C. Maxfield <mmaxfi...@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_w...@apple.com>
AX: Add support for ARIA 1.1 attribute 'aria-modal' for dialog and alertdialog
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (191933 => 191934)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2015-11-03 03:23:03 UTC (rev 191933)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2015-11-03 03:52:16 UTC (rev 191934)
@@ -73,7 +73,11 @@
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");
}
}
