<!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>[181172] 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/181172">181172</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 11:08:55 -0800 (Fri, 06 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Crash in -[WebCascadeList objectAtIndex:] + 195
https://bugs.webkit.org/show_bug.cgi?id=141274

Reviewed by David Kilzer.

Source/WebCore:

CTFontDescriptorRefs can live forever in caches inside CoreText, which means our
WebCascadeList can too.

Test: platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list.html

* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::FontCascade): Initialize WeakPtrFactory.
* platform/graphics/FontCascade.h:
(WebCore::FontCascade::createWeakPtr):
* platform/graphics/mac/ComplexTextControllerCoreText.mm: Migrate the raw pointer
to WeakPtr.
(-[WebCascadeList initWithFont:character:]):
(-[WebCascadeList count]):
(-[WebCascadeList objectAtIndex:]):

Source/WTF:

* wtf/WeakPtr.h:
(WTF::WeakPtrFactory::createWeakPtr): WebCascadeList uses a const FontCascade,
and it calls createWeakPtr() on it. Therefore, createWeakPtr has to be marked
const.
(WTF::WeakPtrFactory::operator=): Removed because it was broken and had no
callers

LayoutTests:

* platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list-expected.txt: Added.
* platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfWeakPtrh">trunk/Source/WTF/wtf/WeakPtr.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm">trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfasttextcrashcomplextextcontrollercustomcascadelistexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextcrashcomplextextcontrollercustomcascadelisthtml">trunk/LayoutTests/platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181171 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-03-06 19:06:30 UTC (rev 181171)
+++ trunk/LayoutTests/ChangeLog        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-06  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Crash in -[WebCascadeList objectAtIndex:] + 195
+        https://bugs.webkit.org/show_bug.cgi?id=141274
+
+        Reviewed by David Kilzer.
+
+        * platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list-expected.txt: Added.
+        * platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list.html: Added.
+
</ins><span class="cx"> 2015-03-06  Said Abou-Hallawa  &lt;sabouhallawa@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Setting any of the &lt;object&gt; element plugin controlling attributes does not have any affect.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextcrashcomplextextcontrollercustomcascadelistexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list-expected.txt (0 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list-expected.txt        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Passed - no crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextcrashcomplextextcontrollercustomcascadelisthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list.html (0 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list.html                                (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list.html        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+  &lt;head&gt;
+    &lt;script src=&quot;../../../../resources/gc.js&quot;&gt;&lt;/script&gt;
+    &lt;meta charset=&quot;utf-8&quot;/&gt;
+  &lt;/head&gt;
+  &lt;body&gt;
+    &lt;p&gt;
+      &lt;math&gt;&lt;mi id=&quot;sin&quot;&gt;sin&lt;/mi&gt;&lt;/math&gt;
+      &lt;math&gt;&lt;mi mathvariant=&quot;bold&quot;&gt;x&lt;/mi&gt;&lt;/math&gt;
+    &lt;/p&gt;
+    &lt;p&gt;
+      &lt;math&gt;&lt;mo&gt;-&lt;/mo&gt;&lt;mi&gt;sin&lt;/mi&gt;&lt;mi&gt;x&lt;/mi&gt;&lt;/math&gt;
+    &lt;/p&gt;
+
+  &lt;/body&gt;
+&lt;script&gt;
+  document.getElementById(&quot;sin&quot;).setAttribute(&quot;style&quot;,&quot;text-rendering:auto;&quot;);
+  document.getElementById(&quot;sin&quot;).appendChild(document.createTextNode('\u6888\u9867\uaa6f\u9b40\u7420\uf87f\u8491\ud608\u39bd\ucddb\u5d99\ud529\u8c59\u9e80'));
+  window.gc();
+  if (window.testRunner)
+    testRunner.dumpAsText();
+  document.body.innerText = &quot;Passed - no crash.&quot;;
+&lt;/script&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (181171 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2015-03-06 19:06:30 UTC (rev 181171)
+++ trunk/Source/WTF/ChangeLog        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-06  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Crash in -[WebCascadeList objectAtIndex:] + 195
+        https://bugs.webkit.org/show_bug.cgi?id=141274
+
+        Reviewed by David Kilzer.
+
+        * wtf/WeakPtr.h:
+        (WTF::WeakPtrFactory::createWeakPtr): WebCascadeList uses a const FontCascade,
+        and it calls createWeakPtr() on it. Therefore, createWeakPtr has to be marked
+        const.
+        (WTF::WeakPtrFactory::operator=): Removed because it was broken and had no
+        callers
+
</ins><span class="cx"> 2015-03-06  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Allow tree dumping functions to be used in release builds by switching a flag
</span></span></pre></div>
<a id="trunkSourceWTFwtfWeakPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WeakPtr.h (181171 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WeakPtr.h        2015-03-06 19:06:30 UTC (rev 181171)
+++ trunk/Source/WTF/wtf/WeakPtr.h        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -99,7 +99,6 @@
</span><span class="cx">     operator bool() const { return m_ref-&gt;get(); }
</span><span class="cx"> 
</span><span class="cx">     WeakPtr&amp; operator=(const WeakPtr&amp; o) { m_ref = o.m_ref.copyRef(); return *this; }
</span><del>-    template&lt;typename U&gt; WeakPtr&amp; operator=(const WeakPtr&lt;U&gt;&amp; o) { m_ref = o.m_ref.copyRef(); return *this; }
</del><span class="cx">     WeakPtr&amp; operator=(std::nullptr_t) { m_ref = WeakReference&lt;T&gt;::create(nullptr); return *this; }
</span><span class="cx"> 
</span><span class="cx">     T* operator-&gt;() const { return m_ref-&gt;get(); }
</span><span class="lines">@@ -123,7 +122,7 @@
</span><span class="cx">     ~WeakPtrFactory() { m_ref-&gt;clear(); }
</span><span class="cx"> 
</span><span class="cx">     // We should consider having createWeakPtr populate m_ref the first time createWeakPtr is called.
</span><del>-    WeakPtr&lt;T&gt; createWeakPtr() { return WeakPtr&lt;T&gt;(m_ref.copyRef()); }
</del><ins>+    WeakPtr&lt;T&gt; createWeakPtr() const { return WeakPtr&lt;T&gt;(m_ref.copyRef()); }
</ins><span class="cx"> 
</span><span class="cx">     void revokeAll()
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181171 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-03-06 19:06:30 UTC (rev 181171)
+++ trunk/Source/WebCore/ChangeLog        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-03-06  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Crash in -[WebCascadeList objectAtIndex:] + 195
+        https://bugs.webkit.org/show_bug.cgi?id=141274
+
+        Reviewed by David Kilzer.
+
+        CTFontDescriptorRefs can live forever in caches inside CoreText, which means our
+        WebCascadeList can too.
+
+        Test: platform/mac/fast/text/crash-complextextcontroller-custom-cascade-list.html
+
+        * platform/graphics/FontCascade.cpp:
+        (WebCore::FontCascade::FontCascade): Initialize WeakPtrFactory.
+        * platform/graphics/FontCascade.h:
+        (WebCore::FontCascade::createWeakPtr):
+        * platform/graphics/mac/ComplexTextControllerCoreText.mm: Migrate the raw pointer
+        to WeakPtr.
+        (-[WebCascadeList initWithFont:character:]):
+        (-[WebCascadeList count]):
+        (-[WebCascadeList objectAtIndex:]):
+
+2015-03-06  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
</ins><span class="cx">         Rename BreakingContextInlineHeaders.h to BreakingContext.h
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=142404
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (181171 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp        2015-03-06 19:06:30 UTC (rev 181171)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -108,7 +108,8 @@
</span><span class="cx"> // ============================================================================================
</span><span class="cx"> 
</span><span class="cx"> FontCascade::FontCascade()
</span><del>-    : m_letterSpacing(0)
</del><ins>+    : m_weakPtrFactory(this)
+    , m_letterSpacing(0)
</ins><span class="cx">     , m_wordSpacing(0)
</span><span class="cx">     , m_useBackslashAsYenSymbol(false)
</span><span class="cx">     , m_typesettingFeatures(0)
</span><span class="lines">@@ -117,6 +118,7 @@
</span><span class="cx"> 
</span><span class="cx"> FontCascade::FontCascade(const FontDescription&amp; fd, float letterSpacing, float wordSpacing)
</span><span class="cx">     : m_fontDescription(fd)
</span><ins>+    , m_weakPtrFactory(this)
</ins><span class="cx">     , m_letterSpacing(letterSpacing)
</span><span class="cx">     , m_wordSpacing(wordSpacing)
</span><span class="cx">     , m_useBackslashAsYenSymbol(useBackslashAsYenSignForFamily(fd.firstFamily()))
</span><span class="lines">@@ -127,6 +129,7 @@
</span><span class="cx"> // FIXME: We should make this constructor platform-independent.
</span><span class="cx"> FontCascade::FontCascade(const FontPlatformData&amp; fontData, FontSmoothingMode fontSmoothingMode)
</span><span class="cx">     : m_fonts(FontCascadeFonts::createForPlatformFont(fontData))
</span><ins>+    , m_weakPtrFactory(this)
</ins><span class="cx">     , m_letterSpacing(0)
</span><span class="cx">     , m_wordSpacing(0)
</span><span class="cx">     , m_useBackslashAsYenSymbol(false)
</span><span class="lines">@@ -144,7 +147,8 @@
</span><span class="cx"> // FIXME: We should make this constructor platform-independent.
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> FontCascade::FontCascade(const FontPlatformData&amp; fontData, PassRefPtr&lt;FontSelector&gt; fontSelector)
</span><del>-    : m_letterSpacing(0)
</del><ins>+    : m_weakPtrFactory(this)
+    , m_letterSpacing(0)
</ins><span class="cx">     , m_wordSpacing(0)
</span><span class="cx">     , m_typesettingFeatures(computeTypesettingFeatures())
</span><span class="cx"> {
</span><span class="lines">@@ -160,6 +164,7 @@
</span><span class="cx"> FontCascade::FontCascade(const FontCascade&amp; other)
</span><span class="cx">     : m_fontDescription(other.m_fontDescription)
</span><span class="cx">     , m_fonts(other.m_fonts)
</span><ins>+    , m_weakPtrFactory(this)
</ins><span class="cx">     , m_letterSpacing(other.m_letterSpacing)
</span><span class="cx">     , m_wordSpacing(other.m_wordSpacing)
</span><span class="cx">     , m_useBackslashAsYenSymbol(other.m_useBackslashAsYenSymbol)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (181171 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h        2015-03-06 19:06:30 UTC (rev 181171)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include &quot;TypesettingFeatures.h&quot;
</span><span class="cx"> #include &lt;wtf/HashMap.h&gt;
</span><span class="cx"> #include &lt;wtf/HashSet.h&gt;
</span><ins>+#include &lt;wtf/WeakPtr.h&gt;
</ins><span class="cx"> #include &lt;wtf/unicode/CharacterNames.h&gt;
</span><span class="cx"> 
</span><span class="cx"> // &quot;X11/X.h&quot; defines Complex to 0 and conflicts
</span><span class="lines">@@ -208,6 +209,8 @@
</span><span class="cx"> 
</span><span class="cx">     bool primaryFontIsSystemFont() const;
</span><span class="cx"> 
</span><ins>+    WeakPtr&lt;FontCascade&gt; createWeakPtr() const { return m_weakPtrFactory.createWeakPtr(); }
+
</ins><span class="cx"> private:
</span><span class="cx">     enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis };
</span><span class="cx"> 
</span><span class="lines">@@ -336,6 +339,7 @@
</span><span class="cx"> 
</span><span class="cx">     FontDescription m_fontDescription;
</span><span class="cx">     mutable RefPtr&lt;FontCascadeFonts&gt; m_fonts;
</span><ins>+    WeakPtrFactory&lt;FontCascade&gt; m_weakPtrFactory;
</ins><span class="cx">     float m_letterSpacing;
</span><span class="cx">     float m_wordSpacing;
</span><span class="cx">     mutable bool m_useBackslashAsYenSymbol;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (181171 => 181172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm        2015-03-06 19:06:30 UTC (rev 181171)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm        2015-03-06 19:08:55 UTC (rev 181172)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include &quot;FontCascade.h&quot;
</span><span class="cx"> #include &quot;TextRun.h&quot;
</span><span class="cx"> #include &quot;WebCoreSystemInterface.h&quot;
</span><ins>+#include &lt;wtf/WeakPtr.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include &lt;CoreText/CoreText.h&gt;
</span><span class="lines">@@ -38,9 +39,10 @@
</span><span class="cx"> #include &lt;ApplicationServices/ApplicationServices.h&gt;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+// Note: CTFontDescriptorRefs can live forever in caches inside CoreText, so this object can too.
</ins><span class="cx"> @interface WebCascadeList : NSArray {
</span><span class="cx">     @private
</span><del>-    const WebCore::FontCascade* _font;
</del><ins>+    WeakPtr&lt;WebCore::FontCascade&gt; _font;
</ins><span class="cx">     UChar32 _character;
</span><span class="cx">     NSUInteger _count;
</span><span class="cx">     Vector&lt;RetainPtr&lt;CTFontDescriptorRef&gt;, 16&gt; _fontDescriptors;
</span><span class="lines">@@ -57,7 +59,7 @@
</span><span class="cx">     if (!(self = [super init]))
</span><span class="cx">         return nil;
</span><span class="cx"> 
</span><del>-    _font = font;
</del><ins>+    _font = font-&gt;createWeakPtr();
</ins><span class="cx">     _character = character;
</span><span class="cx"> 
</span><span class="cx">     // By the time a WebCascadeList is used, the FontCascade has already been asked to realize all of its
</span><span class="lines">@@ -70,11 +72,14 @@
</span><span class="cx"> 
</span><span class="cx"> - (NSUInteger)count
</span><span class="cx"> {
</span><del>-    return _count;
</del><ins>+    return _font ? _count : 0;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (id)objectAtIndex:(NSUInteger)index
</span><span class="cx"> {
</span><ins>+    if (!_font)
+        return nil;
+
</ins><span class="cx">     CTFontDescriptorRef fontDescriptor;
</span><span class="cx">     if (index &lt; _fontDescriptors.size()) {
</span><span class="cx">         if ((fontDescriptor = _fontDescriptors[index].get()))
</span></span></pre>
</div>
</div>

</body>
</html>