<!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>[201358] 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/201358">201358</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-05-24 15:04:07 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Font Loading] Crash during font download failure after garbage collection
https://bugs.webkit.org/show_bug.cgi?id=158013
<rdar://problem/25148032>
Reviewed by Darin Adler.
Source/WebCore:
Usually, ownership during font loading is top-down - JavaScript owns a JSFontFace,
which owns a FontFace, which owns a CSSFontFace. However, when we receive the
asynchronous callback that a font finished loading, the call comes in from the
bottom - it is delivered from the CSSFontFaceSource to the CSSFontFace, and then
to the FontFace. If a garbage collection had previously run, we might remove
the last reference to ourself during this asynchronous callback. A simple guard
makes sure this doesn't happen.
Test: fast/text/font-face-crash.html
* css/CSSFontFace.cpp:
(WebCore::CSSFontFace::fontLoaded):
LayoutTests:
* fast/text/font-face-crash-expected.txt: Added.
* fast/text/font-face-crash.html: Added.</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="#trunkSourceWebCorecssCSSFontFacecpp">trunk/Source/WebCore/css/CSSFontFace.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextfontfacecrashexpectedtxt">trunk/LayoutTests/fast/text/font-face-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontfacecrashhtml">trunk/LayoutTests/fast/text/font-face-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201357 => 201358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-24 22:03:30 UTC (rev 201357)
+++ trunk/LayoutTests/ChangeLog 2016-05-24 22:04:07 UTC (rev 201358)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Font Loading] Crash during font download failure after garbage collection
+ https://bugs.webkit.org/show_bug.cgi?id=158013
+ <rdar://problem/25148032>
+
+ Reviewed by Darin Adler.
+
+ * fast/text/font-face-crash-expected.txt: Added.
+ * fast/text/font-face-crash.html: Added.
+
</ins><span class="cx"> 201-05-24 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201349.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontfacecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-face-crash-expected.txt (0 => 201358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/font-face-crash-expected.txt 2016-05-24 22:04:07 UTC (rev 201358)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test makes sure that our failure load callback doesn't cause a crash if all the references to the FontFace have died. The test passes if there is no crash.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/text/font-face-crash-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfasttextfontfacecrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-face-crash.html (0 => 201358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-crash.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-face-crash.html 2016-05-24 22:04:07 UTC (rev 201358)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+(function() {
+ var font = new FontFace("WebFont", "url('notarealfont')", {});
+ font.load();
+})();
+if (window.GCController)
+ GCController.collect();
+</script>
+<div style="font-family: WebFont;">This test makes sure that our failure load callback doesn't cause a crash if all the references to the FontFace have died. The test passes if there is no crash.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201357 => 201358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-24 22:03:30 UTC (rev 201357)
+++ trunk/Source/WebCore/ChangeLog 2016-05-24 22:04:07 UTC (rev 201358)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-24 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Font Loading] Crash during font download failure after garbage collection
+ https://bugs.webkit.org/show_bug.cgi?id=158013
+ <rdar://problem/25148032>
+
+ Reviewed by Darin Adler.
+
+ Usually, ownership during font loading is top-down - JavaScript owns a JSFontFace,
+ which owns a FontFace, which owns a CSSFontFace. However, when we receive the
+ asynchronous callback that a font finished loading, the call comes in from the
+ bottom - it is delivered from the CSSFontFaceSource to the CSSFontFace, and then
+ to the FontFace. If a garbage collection had previously run, we might remove
+ the last reference to ourself during this asynchronous callback. A simple guard
+ makes sure this doesn't happen.
+
+ Test: fast/text/font-face-crash.html
+
+ * css/CSSFontFace.cpp:
+ (WebCore::CSSFontFace::fontLoaded):
+
</ins><span class="cx"> 2016-05-24 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201349.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (201357 => 201358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.cpp 2016-05-24 22:03:30 UTC (rev 201357)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp 2016-05-24 22:04:07 UTC (rev 201358)
</span><span class="lines">@@ -421,6 +421,8 @@
</span><span class="cx">
</span><span class="cx"> void CSSFontFace::fontLoaded(CSSFontFaceSource&)
</span><span class="cx"> {
</span><ins>+ Ref<CSSFontFace> protectedThis(*this);
+
</ins><span class="cx"> // If the font is already in the cache, CSSFontFaceSource may report it's loaded before it is added here as a source.
</span><span class="cx"> // Let's not pump the state machine until we've got all our sources. font() and load() are smart enough to act correctly
</span><span class="cx"> // when a source is failed or succeeded before we have asked it to load.
</span></span></pre>
</div>
</div>
</body>
</html>