<!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>[174515] 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/174515">174515</a></dd>
<dt>Author</dt> <dd>betravis@adobe.com</dd>
<dt>Date</dt> <dd>2014-10-09 11:43:25 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Font Loading] Decrement the font loading count before notifying callbacks
https://bugs.webkit.org/show_bug.cgi?id=137401
Reviewed by Alexey Proskuryakov.
Source/WebCore:
In the callbacks, it should appear that font load has completed. This is
accessed through loading(), which relies on the current number of
fonts loading via JS and CSS.
Unskipping the failing test http/tests/webfont/fontloader-loading-attribute.html
test which tests this.
* css/FontLoader.cpp:
(WebCore::LoadFontCallback::notifyLoaded):
LayoutTests:
* platform/mac/TestExpectations: Unskip the test this bug was causing to fail.</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="#trunkSourceWebCorecssFontLoadercpp">trunk/Source/WebCore/css/FontLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (174514 => 174515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-09 18:41:00 UTC (rev 174514)
+++ trunk/LayoutTests/ChangeLog 2014-10-09 18:43:25 UTC (rev 174515)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-10-09 Bear Travis <betravis@adobe.com>
+
+ [CSS Font Loading] Decrement the font loading count before notifying callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=137401
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/mac/TestExpectations: Unskip the test this bug was causing to fail.
+
</ins><span class="cx"> 2014-10-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS Simulator results for editing tests.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (174514 => 174515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-10-09 18:41:00 UTC (rev 174514)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-10-09 18:43:25 UTC (rev 174515)
</span><span class="lines">@@ -1361,7 +1361,7 @@
</span><span class="cx"> webkit.org/b/135390 fast/css/fontloader-multiple-faces.html [ Pass ]
</span><span class="cx"> webkit.org/b/135390 fast/css/fontloader-multiple-families.html [ Pass ]
</span><span class="cx"> webkit.org/b/135390 fast/css/fontloader-page-cache.html [ Pass ]
</span><del>-webkit.org/b/135390 http/tests/webfont/fontloader-loading-attribute.html [ Skip ]
</del><ins>+webkit.org/b/135390 http/tests/webfont/fontloader-loading-attribute.html [ Pass ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/136994 http/tests/media/hls/video-cookie.html [ Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174514 => 174515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-09 18:41:00 UTC (rev 174514)
+++ trunk/Source/WebCore/ChangeLog 2014-10-09 18:43:25 UTC (rev 174515)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-10-09 Bear Travis <betravis@adobe.com>
+
+ [CSS Font Loading] Decrement the font loading count before notifying callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=137401
+
+ Reviewed by Alexey Proskuryakov.
+
+ In the callbacks, it should appear that font load has completed. This is
+ accessed through loading(), which relies on the current number of
+ fonts loading via JS and CSS.
+
+ Unskipping the failing test http/tests/webfont/fontloader-loading-attribute.html
+ test which tests this.
+
+ * css/FontLoader.cpp:
+ (WebCore::LoadFontCallback::notifyLoaded):
+
</ins><span class="cx"> 2014-10-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed Windows build fix after r174506.
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontLoader.cpp (174514 => 174515)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.cpp 2014-10-09 18:41:00 UTC (rev 174514)
+++ trunk/Source/WebCore/css/FontLoader.cpp 2014-10-09 18:43:25 UTC (rev 174515)
</span><span class="lines">@@ -95,6 +95,8 @@
</span><span class="cx"> if (m_numLoading)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_fontLoader.loadFontDone(*this);
+
</ins><span class="cx"> if (m_errorOccured) {
</span><span class="cx"> if (m_errorCallback)
</span><span class="cx"> m_errorCallback->handleEvent();
</span><span class="lines">@@ -102,7 +104,6 @@
</span><span class="cx"> if (m_loadCallback)
</span><span class="cx"> m_loadCallback->handleEvent();
</span><span class="cx"> }
</span><del>- m_fontLoader.loadFontDone(*this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LoadFontCallback::notifyError()
</span></span></pre>
</div>
</div>
</body>
</html>