Title: [112942] trunk/Source/WebCore
- Revision
- 112942
- Author
- timothy_hor...@apple.com
- Date
- 2012-04-02 14:19:29 -0700 (Mon, 02 Apr 2012)
Log Message
ASSERTION FAILED: m_purgePreventCount in FontCache::getCachedFontData running svg/custom/animate-disallowed-use-element.svg
https://bugs.webkit.org/show_bug.cgi?id=81002
<rdar://problem/11168969>
Reviewed by Simon Fraser.
Don't spend time rebuilding SVG text layout attributes if the document is being torn down, as
they won't be used, and can cause assertion failures in the font cache.
No new tests, as it fixes an intermittent assertion failure during document destruction.
* rendering/svg/RenderSVGInlineText.cpp:
(WebCore::RenderSVGInlineText::willBeDestroyed):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112941 => 112942)
--- trunk/Source/WebCore/ChangeLog 2012-04-02 21:16:03 UTC (rev 112941)
+++ trunk/Source/WebCore/ChangeLog 2012-04-02 21:19:29 UTC (rev 112942)
@@ -1,3 +1,19 @@
+2012-04-02 Tim Horton <timothy_hor...@apple.com>
+
+ ASSERTION FAILED: m_purgePreventCount in FontCache::getCachedFontData running svg/custom/animate-disallowed-use-element.svg
+ https://bugs.webkit.org/show_bug.cgi?id=81002
+ <rdar://problem/11168969>
+
+ Reviewed by Simon Fraser.
+
+ Don't spend time rebuilding SVG text layout attributes if the document is being torn down, as
+ they won't be used, and can cause assertion failures in the font cache.
+
+ No new tests, as it fixes an intermittent assertion failure during document destruction.
+
+ * rendering/svg/RenderSVGInlineText.cpp:
+ (WebCore::RenderSVGInlineText::willBeDestroyed):
+
2012-04-02 Lianghui Chen <liac...@rim.com>
[BlackBerry] Set ResourceRequest TargetType in WebPagePrivate::load()
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp (112941 => 112942)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp 2012-04-02 21:16:03 UTC (rev 112941)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp 2012-04-02 21:19:29 UTC (rev 112942)
@@ -87,7 +87,8 @@
if (affectedAttributes.isEmpty())
return;
- textRenderer->rebuildLayoutAttributes(affectedAttributes);
+ if (!documentBeingDestroyed())
+ textRenderer->rebuildLayoutAttributes(affectedAttributes);
}
void RenderSVGInlineText::setTextInternal(PassRefPtr<StringImpl> text)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
