<!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>[202983] 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/202983">202983</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-07-08 09:42:20 -0700 (Fri, 08 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/202945">r202945</a>.
https://bugs.webkit.org/show_bug.cgi?id=159565
The test for this change is failing on all platforms.
(Requested by ryanhaddad on #webkit).
Reverted changeset:
"[Font Loading] The callback passed to document.fonts.ready
should always be called"
https://bugs.webkit.org/show_bug.cgi?id=158884
http://trac.webkit.org/changeset/202945
Patch by Commit Queue <commit-queue@webkit.org> on 2016-07-08</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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>Removed 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 (202982 => 202983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/LayoutTests/ChangeLog 2016-07-08 16:42:20 UTC (rev 202983)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202945.
+ https://bugs.webkit.org/show_bug.cgi?id=159565
+
+ The test for this change is failing on all platforms.
+ (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "[Font Loading] The callback passed to document.fonts.ready
+ should always be called"
+ https://bugs.webkit.org/show_bug.cgi?id=158884
+ http://trac.webkit.org/changeset/202945
+
</ins><span class="cx"> 2016-07-08 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> TypedArrays need more isNeutered checks.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontfacesetreadyfireexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt (202982 => 202983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt 2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/LayoutTests/fast/text/font-face-set-ready-fire-expected.txt 2016-07-08 16:42:20 UTC (rev 202983)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="trunkLayoutTestsfasttextfontfacesetreadyfirehtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/text/font-face-set-ready-fire.html (202982 => 202983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-set-ready-fire.html 2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/LayoutTests/fast/text/font-face-set-ready-fire.html 2016-07-08 16:42:20 UTC (rev 202983)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-<!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.")
-
-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>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202982 => 202983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/Source/WebCore/ChangeLog 2016-07-08 16:42:20 UTC (rev 202983)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202945.
+ https://bugs.webkit.org/show_bug.cgi?id=159565
+
+ The test for this change is failing on all platforms.
+ (Requested by ryanhaddad on #webkit).
+
+ Reverted changeset:
+
+ "[Font Loading] The callback passed to document.fonts.ready
+ should always be called"
+ https://bugs.webkit.org/show_bug.cgi?id=158884
+ http://trac.webkit.org/changeset/202945
+
</ins><span class="cx"> 2016-07-08 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> ExecState should be passed by reference in JS bindings generator for custom constructors
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFaceSet.cpp (202982 => 202983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFaceSet.cpp 2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/Source/WebCore/css/FontFaceSet.cpp 2016-07-08 16:42:20 UTC (rev 202983)
</span><span class="lines">@@ -197,7 +197,6 @@
</span><span class="cx"> void FontFaceSet::startedLoading()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Fire a "loading" event asynchronously.
</span><del>- m_isReady = false;
</del><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 (202982 => 202983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFaceSet.h 2016-07-08 16:27:35 UTC (rev 202982)
+++ trunk/Source/WebCore/css/FontFaceSet.h 2016-07-08 16:42:20 UTC (rev 202983)
</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 { true };
</del><ins>+ bool m_isReady { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>