<!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>[201394] 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/201394">201394</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-05-25 12:08:02 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Font Loading] ASSERT if calling FontFace.loaded twice with a garbage collection between them
https://bugs.webkit.org/show_bug.cgi?id=158015
Reviewed by Darin Adler.
Source/WebCore:
The following scenario may occur:
1. We create a FontFace object
2. We create an associated JSFontFace object
3. We start loading the FontFace, which causes an extra ref to hang around until loading finishes
4. Javascript calls the "loaded" attribute on the FontFace, which saves a promise inside the FontFace
5. The FontFace goes out of scope in Javascript
6. A garbage collection occurs, causing us to delete the JSFontFace object
7. Javascript then encounters the FontFace object without first going through a reference to a JSFontFace.
It can do this via iterating through a FontFaceSet. We respond to this situation by creating a new
JSFontFace object and associating it with the existing FontFace.
8. Javascript calls the "loaded" attribute
In this situation, the newer JSFontFace object is out of sync with the older FontFace object. In
particular, the FontFace has a saved promise, but the JSFontFace doesn't know about it. Therefore,
the JSFontFace should be flexible to the presence of this member.
Test: fast/text/font-face-crash-2.html
* bindings/js/JSDOMPromise.h:
(WebCore::DOMPromise::deferredWrapper):
* bindings/js/JSFontFaceCustom.cpp:
(WebCore::JSFontFace::loaded):
* css/FontFace.h:
LayoutTests:
* fast/text/font-face-crash-2-expected.txt: Added.
* fast/text/font-face-crash-2.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="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSFontFaceCustomcpp">trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontFaceh">trunk/Source/WebCore/css/FontFace.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextfontfacecrash2expectedtxt">trunk/LayoutTests/fast/text/font-face-crash-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontfacecrash2html">trunk/LayoutTests/fast/text/font-face-crash-2.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201393 => 201394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-25 19:04:47 UTC (rev 201393)
+++ trunk/LayoutTests/ChangeLog 2016-05-25 19:08:02 UTC (rev 201394)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-25 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Font Loading] ASSERT if calling FontFace.loaded twice with a garbage collection between them
+ https://bugs.webkit.org/show_bug.cgi?id=158015
+
+ Reviewed by Darin Adler.
+
+ * fast/text/font-face-crash-2-expected.txt: Added.
+ * fast/text/font-face-crash-2.html: Added.
+
</ins><span class="cx"> 2016-05-25 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Shadow DOM: RenderTreePosition should determine if element has display:contents from new style
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontfacecrash2expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-face-crash-2-expected.txt (0 => 201394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-crash-2-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/font-face-crash-2-expected.txt 2016-05-25 19:08:02 UTC (rev 201394)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test makes sure that if we construct two JSFontFaces for the same FontFace, and call "loaded" on both of them, that there is no ASSERT.
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/text/font-face-crash-2-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="trunkLayoutTestsfasttextfontfacecrash2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-face-crash-2.html (0 => 201394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-face-crash-2.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-face-crash-2.html 2016-05-25 19:08:02 UTC (rev 201394)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+(function() {
+ var font = new FontFace("WebFont", "url('notarealfont')", {});
+ font.loaded;
+ font.load();
+ document.fonts.add(font);
+})();
+if (window.GCController)
+ GCController.collect();
+document.fonts.forEach(function(font) {
+ if (font.family == "WebFont")
+ font.loaded;
+});
+</script>
+This test makes sure that if we construct two JSFontFaces for the same FontFace, and call "loaded" on both of them, that there is no ASSERT.
+</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 (201393 => 201394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-25 19:04:47 UTC (rev 201393)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 19:08:02 UTC (rev 201394)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-05-25 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Font Loading] ASSERT if calling FontFace.loaded twice with a garbage collection between them
+ https://bugs.webkit.org/show_bug.cgi?id=158015
+
+ Reviewed by Darin Adler.
+
+ The following scenario may occur:
+
+ 1. We create a FontFace object
+ 2. We create an associated JSFontFace object
+ 3. We start loading the FontFace, which causes an extra ref to hang around until loading finishes
+ 4. Javascript calls the "loaded" attribute on the FontFace, which saves a promise inside the FontFace
+ 5. The FontFace goes out of scope in Javascript
+ 6. A garbage collection occurs, causing us to delete the JSFontFace object
+ 7. Javascript then encounters the FontFace object without first going through a reference to a JSFontFace.
+ It can do this via iterating through a FontFaceSet. We respond to this situation by creating a new
+ JSFontFace object and associating it with the existing FontFace.
+ 8. Javascript calls the "loaded" attribute
+
+ In this situation, the newer JSFontFace object is out of sync with the older FontFace object. In
+ particular, the FontFace has a saved promise, but the JSFontFace doesn't know about it. Therefore,
+ the JSFontFace should be flexible to the presence of this member.
+
+ Test: fast/text/font-face-crash-2.html
+
+ * bindings/js/JSDOMPromise.h:
+ (WebCore::DOMPromise::deferredWrapper):
+ * bindings/js/JSFontFaceCustom.cpp:
+ (WebCore::JSFontFace::loaded):
+ * css/FontFace.h:
+
</ins><span class="cx"> 2016-05-25 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Shadow DOM: RenderTreePosition miscomputed when display:contents value changes
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (201393 => 201394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-05-25 19:04:47 UTC (rev 201393)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-05-25 19:08:02 UTC (rev 201394)
</span><span class="lines">@@ -165,6 +165,8 @@
</span><span class="cx">
</span><span class="cx"> template<typename... ErrorType> void reject(ErrorType&&... error) { m_wrapper.reject(std::forward<ErrorType>(error)...); }
</span><span class="cx">
</span><ins>+ DeferredWrapper& deferredWrapper() { return m_wrapper; }
+
</ins><span class="cx"> private:
</span><span class="cx"> DeferredWrapper m_wrapper;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSFontFaceCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp (201393 => 201394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp 2016-05-25 19:04:47 UTC (rev 201393)
+++ trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp 2016-05-25 19:08:02 UTC (rev 201394)
</span><span class="lines">@@ -38,9 +38,12 @@
</span><span class="cx"> JSC::JSValue JSFontFace::loaded(JSC::ExecState& state) const
</span><span class="cx"> {
</span><span class="cx"> if (!m_loaded) {
</span><del>- DeferredWrapper promise(&state, globalObject(), JSC::JSPromiseDeferred::create(&state, globalObject()));
- m_loaded.set(state.vm(), this, promise.promise());
- wrapped().registerLoaded(WTFMove(promise));
</del><ins>+ if (!wrapped().promise()) {
+ DeferredWrapper promise(&state, globalObject(), JSC::JSPromiseDeferred::create(&state, globalObject()));
+ m_loaded.set(state.vm(), this, promise.promise());
+ wrapped().registerLoaded(WTFMove(promise));
+ } else
+ m_loaded.set(state.vm(), this, wrapped().promise().value().deferredWrapper().promise());
</ins><span class="cx"> }
</span><span class="cx"> return m_loaded.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.h (201393 => 201394)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.h 2016-05-25 19:04:47 UTC (rev 201393)
+++ trunk/Source/WebCore/css/FontFace.h 2016-05-25 19:08:02 UTC (rev 201394)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> LoadStatus status() const;
</span><span class="cx">
</span><span class="cx"> typedef DOMPromise<FontFace&> Promise;
</span><ins>+ Optional<Promise>& promise() { return m_promise; }
</ins><span class="cx"> void registerLoaded(Promise&&);
</span><span class="cx">
</span><span class="cx"> void load();
</span></span></pre>
</div>
</div>
</body>
</html>