<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191934] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191934">191934</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-11-02 19:52:16 -0800 (Mon, 02 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Cocoa] Support WOFF2
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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextresourcesahemwoff2">trunk/LayoutTests/fast/text/resources/ahem.woff2</a></li>
<li><a href="#trunkLayoutTestsfasttextwoff2expectedhtml">trunk/LayoutTests/fast/text/woff2-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextwoff2html">trunk/LayoutTests/fast/text/woff2.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191933 => 191934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-11-03 03:23:03 UTC (rev 191933)
+++ trunk/LayoutTests/ChangeLog        2015-11-03 03:52:16 UTC (rev 191934)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [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.
+
</ins><span class="cx"> 2015-11-02  Nan Wang  &lt;n_wang@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: Add support for ARIA 1.1 attribute 'aria-modal' for dialog and alertdialog
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextresourcesahemwoff2"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/resources/ahem.woff2 (0 => 191934)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+wOF2\x8CAd'B?FFTM `\x83Z        \x84e
+\xDE8\xCE6$\x87 \x83H \x86Z\x85* 7?webfI6Q\xD4&amp;J\xAA3\xD9\xD7\xEA^D\xD0խ\xA0-/x\xF1\xC2M/@\xF3u&lt;p\xFF L \xAC\x89A&lt;o\xF7_un\xF3}\xB3Z0\x95#F+2\x95B\x99\xD1\xE0\xC0\xBF\xD7KR\xC0\xB9X\x85&gt;\xC8}HS5\x8C\x99:\x83Sg\x8Dݠ\xB56bl&gt;\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!&quot;\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&amp;\xE9\xCCP뮁\x85.\xC8D\xBFvHxu˻\xDExx\xD5a\xDE&gt;\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\&lt;\xDD\xEA݆$\xBCŀ]2'\x96\xAE\xBC\x8B1;;&lt;փ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 &amp;Jʡ\x91\xB1\xFC^A\x96eU\xB7\xB4\xB5wtvu\xF7\xF4\xD2 \xCB\xF1\x82(Ɋ\xAA\xE9L\xCBv\\xCF\xC2(N&gt;\xDF4ˋ\xB2\xAA\x9B\xB6\xEB\x87q\x9A\x97uۥ2\xB9B\xA9Rk\xB4:\xBD\xC1h2[\xAC6\xBB\xC3\xE9r{\xBC&gt; 
+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&amp;\xBCn\xA1\x89\xA0I֡\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&gt;J\xBD?S\\xA09/\xED&lt;\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&quot;\x80\xCAg\xA2\xD5&lt;\xB3JL\xF3\xB3\xD5#vj&amp;\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֊\xDESw \xB8aض&amp;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&lt;x\xB2\xDDA\xAB\x8FQ\xB4\xC3o&quot;&gt;\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&amp;ӡ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&lt;\xC7\xF9\xC6\xB8z {\xCD~?\xF0\xC1&quot;ַ\xBA\xE9\xAE\xE8#\xAA|}\xFF\x820\x87\xB6߀ \xF0u\xAE\x87n4\x9E&amp;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&amp;\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&gt;\xF7nڊ\xBE\x8C%+\xDD_\xC1L\xA7\xE1\xA3\xCCX:_RV\xA2\xF0J#\x88W&quot;LňCYiy9.JX        \x98&quot;\xA98MA\x82\x92\x9FB}\xD7\x9A\x8DK9\x80\xCD(\xE2        ڀ&amp;\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{ی&gt;C&amp;c\xB3(:\x94a~p+\x82\x99\x81E\x92\x8B|\xE0hX&amp;\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\xB0bhr\xAA\xE2ᯤD\xDBU%`\xE6\xBB\xDBFh\xED\x9F\xE63\x8F\xFB7)2\x99\\xA1T\xA9\xB5\xB4\xEBЩK\xB7Gs\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&quot;\xB1\xE7؁CG&gt;H|p\xE2\xD40\xA9\xFF\xAEt\xE5\xC2%\x99_~x(\xA2\xE2b\xB6i\xA5\xA5\xAE\x90\x8B\x9B\x97SP\xF4\x93QEYU]\xCD+&amp;+-\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
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/fast/text/resources/ahem.woff2
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="trunkLayoutTestsfasttextwoff2expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/woff2-expected.html (0 => 191934)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+@font-face {
+    font-family: &quot;webfont&quot;;
+    src: url(&quot;../../resources/Ahem.ttf&quot;) format(&quot;truetype&quot;);
+}
+#test {
+    font: 40px &quot;webfont&quot;;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test makes sure WOFF2 renders as expected. The test passes if you see a horizontal black rectangle below.
+&lt;div id=&quot;test&quot;&gt;Hello&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextwoff2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/woff2.html (0 => 191934)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/woff2.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/woff2.html        2015-11-03 03:52:16 UTC (rev 191934)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+@font-face {
+    font-family: &quot;webfont&quot;;
+    src: url(&quot;resources/ahem.woff2&quot;) format(&quot;woff2&quot;);
+}
+#test {
+    font: 40px &quot;webfont&quot;;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test makes sure WOFF2 renders as expected. The test passes if you see a horizontal black rectangle below.
+&lt;div id=&quot;test&quot;&gt;Hello&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (191933 => 191934)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1354,4 +1354,7 @@
</span><span class="cx"> webkit.org/b/147933 streams/reference-implementation/writable-stream-abort.html [ Pass Failure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/150806 imported/w3c/web-platform-tests/XMLHttpRequest/send-timeout-events.htm [ Pass Failure ]
</span><del>-webkit.org/b/150823 imported/w3c/web-platform-tests/XMLHttpRequest/getresponseheader-chunked-trailer.htm [ Pass Failure ]
</del><span class="cx">\ No newline at end of file
</span><ins>+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 ]
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191933 => 191934)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-11-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        [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):
+
</ins><span class="cx"> 2015-11-02  Nan Wang  &lt;n_wang@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: Add support for ARIA 1.1 attribute 'aria-modal' for dialog and alertdialog
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (191933 => 191934)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -73,7 +73,11 @@
</span><span class="cx"> 
</span><span class="cx"> bool FontCustomPlatformData::supportsFormat(const String&amp; format)
</span><span class="cx"> {
</span><del>-    return equalIgnoringCase(format, &quot;truetype&quot;) || equalIgnoringCase(format, &quot;opentype&quot;) || equalIgnoringCase(format, &quot;woff&quot;);
</del><ins>+    return equalIgnoringCase(format, &quot;truetype&quot;) || equalIgnoringCase(format, &quot;opentype&quot;)
+#if (PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 100000) || (PLATFORM(MAC) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101200)
+        || equalIgnoringCase(format, &quot;woff2&quot;)
+#endif
+    || equalIgnoringCase(format, &quot;woff&quot;);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>