<!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>[203002] 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/203002">203002</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-07-08 12:40:20 -0700 (Fri, 08 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Font Loading] The callback passed to document.fonts.ready should always be called
https://bugs.webkit.org/show_bug.cgi?id=158884
Reviewed by Dean Jackson.
Source/WebCore:
The boolean was simply not being reset when loads start.
Test: fast/text/font-face-set-ready-fire.html
* css/FontFaceSet.cpp:
(WebCore::FontFaceSet::startedLoading):
* css/FontFaceSet.h:
LayoutTests:
* TestExpectations:
* fast/text/font-face-set-ready-fire-expected.txt: Added.
* fast/text/font-face-set-ready-fire.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssFontFaceSetcpp">trunk/Source/WebCore/css/FontFaceSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFaceSeth">trunk/Source/WebCore/css/FontFaceSet.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextfontfacesetreadyfireexpectedtxt">trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontfacesetreadyfirehtml">trunk/LayoutTests/fast/text/font-face-set-ready-fire.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203001 => 203002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-08 19:01:05 UTC (rev 203001)
+++ trunk/LayoutTests/ChangeLog 2016-07-08 19:40:20 UTC (rev 203002)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-07-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Font Loading] The callback passed to document.fonts.ready should always be called
+ https://bugs.webkit.org/show_bug.cgi?id=158884
+
+ Reviewed by Dean Jackson.
+
+ * TestExpectations:
+ * fast/text/font-face-set-ready-fire-expected.txt: Added.
+ * fast/text/font-face-set-ready-fire.html: Added.
+
</ins><span class="cx"> 2016-07-08 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline fast/shadow-dom/trusted-event-scoped-flags.html for ios-simulator after r202953.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (203001 => 203002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-07-08 19:01:05 UTC (rev 203001)
+++ trunk/LayoutTests/TestExpectations 2016-07-08 19:40:20 UTC (rev 203002)
</span><span class="lines">@@ -984,10 +984,3 @@
</span><span class="cx"> webkit.org/b/159370 [ Debug ] fast/history/page-cache-destroy-document.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> [ Debug ] js/regress/misc-bugs-847389-jpeg2000.html [ Skip ]
</span><del>-
-# These tests time out due to https://bugs.webkit.org/show_bug.cgi?id=158884
-imported/mathml-in-html5/mathml/presentation-markup/fractions/frac-parameters-1.html [ Timeout ]
-imported/mathml-in-html5/mathml/presentation-markup/operators/mo-axis-height-1.html [ Timeout ]
-imported/mathml-in-html5/mathml/presentation-markup/radicals/root-parameters-1.html [ Timeout ]
-imported/mathml-in-html5/mathml/presentation-markup/tables/table-axis-height.html [ Timeout ]
-imported/mathml-in-html5/mathml/relations/css-styling/displaystyle-1.html [ Timeout ]
</del></span></pre></div>
<a id="trunkLayoutTestsfasttextfontfacesetreadyfireexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt (0 => 203002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt 2016-07-08 19:40:20 UTC (rev 203002)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This test makes sure that document.fonts.ready always triggers its promise when there are no loads.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.fonts.status is "loaded"
+PASS document.fonts.status is "loading"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Author Date Id Rev URL
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfasttextfontfacesetreadyfirehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-face-set-ready-fire.html (0 => 203002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-set-ready-fire.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-face-set-ready-fire.html 2016-07-08 19:40:20 UTC (rev 203002)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+self.jsTestIsAsync = true;
+description("This test makes sure that document.fonts.ready always triggers its promise when there are no loads.")
+if (window.internals)
+ internals.clearMemoryCache();
+
+var counter = 0;
+function bumpCounter() {
+ counter = counter + 1;
+ if (counter == 4)
+ finishJSTest();
+}
+function failure() {
+ testFailed("Promise should not fail.");
+}
+
+document.fonts.ready.then(bumpCounter);
+window.addEventListener("DOMContentLoaded", function() {
+ document.fonts.ready.then(bumpCounter, failure);
+});
+window.addEventListener("load", function() {
+ document.fonts.ready.then(bumpCounter, failure);
+});
+shouldBeEqualToString("document.fonts.status", "loaded");
+document.fonts.add(new FontFace("WebFont", "url('../../resources/Ahem.ttf') format('truetype')", {}));
+document.fonts.load("14px WebFont").then(bumpCounter, failure);
+shouldBeEqualToString("document.fonts.status", "loading");
+</script>
+</head>
+<body>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203001 => 203002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-08 19:01:05 UTC (rev 203001)
+++ trunk/Source/WebCore/ChangeLog 2016-07-08 19:40:20 UTC (rev 203002)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Font Loading] The callback passed to document.fonts.ready should always be called
+ https://bugs.webkit.org/show_bug.cgi?id=158884
+
+ Reviewed by Dean Jackson.
+
+ The boolean was simply not being reset when loads start.
+
+ Test: fast/text/font-face-set-ready-fire.html
+
+ * css/FontFaceSet.cpp:
+ (WebCore::FontFaceSet::startedLoading):
+ * css/FontFaceSet.h:
+
</ins><span class="cx"> 2016-07-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202944.
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFaceSet.cpp (203001 => 203002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFaceSet.cpp 2016-07-08 19:01:05 UTC (rev 203001)
+++ trunk/Source/WebCore/css/FontFaceSet.cpp 2016-07-08 19:40:20 UTC (rev 203002)
</span><span class="lines">@@ -197,6 +197,7 @@
</span><span class="cx"> void FontFaceSet::startedLoading()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Fire a "loading" event asynchronously.
</span><ins>+ m_isReady = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FontFaceSet::completedLoading()
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFaceSet.h (203001 => 203002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFaceSet.h 2016-07-08 19:01:05 UTC (rev 203001)
+++ trunk/Source/WebCore/css/FontFaceSet.h 2016-07-08 19:40:20 UTC (rev 203002)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> Ref<CSSFontFaceSet> m_backing;
</span><span class="cx"> HashMap<RefPtr<CSSFontFace>, Vector<Ref<PendingPromise>>> m_pendingPromises;
</span><span class="cx"> Optional<ReadyPromise> m_promise;
</span><del>- bool m_isReady { false };
</del><ins>+ bool m_isReady { true };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>