Title: [145642] branches/safari-536.30-branch/Source/WebCore
- Revision
- 145642
- Author
- [email protected]
- Date
- 2013-03-12 17:51:48 -0700 (Tue, 12 Mar 2013)
Log Message
Merged r138812. <rdar://problem/13335055>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (145641 => 145642)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-13 00:50:02 UTC (rev 145641)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-13 00:51:48 UTC (rev 145642)
@@ -1,5 +1,23 @@
2013-03-12 Lucas Forschler <[email protected]>
+ Merge r138812
+
+ 2013-01-04 John Mellor <[email protected]>
+
+ Early out from FontCache::releaseFontData if cached font data not found.
+ https://bugs.webkit.org/show_bug.cgi?id=106104
+
+ Reviewed by Abhishek Arya.
+
+ No tests, as no change in behavior.
+
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::releaseFontData):
+
+ Early out in release builds if cached font data not found.
+
+2013-03-12 Lucas Forschler <[email protected]>
+
Merge r138657
2013-01-02 Abhishek Arya <[email protected]>
Modified: branches/safari-536.30-branch/Source/WebCore/platform/graphics/FontCache.cpp (145641 => 145642)
--- branches/safari-536.30-branch/Source/WebCore/platform/graphics/FontCache.cpp 2013-03-13 00:50:02 UTC (rev 145641)
+++ branches/safari-536.30-branch/Source/WebCore/platform/graphics/FontCache.cpp 2013-03-13 00:51:48 UTC (rev 145642)
@@ -322,6 +322,8 @@
FontDataCache::iterator it = gFontDataCache->find(fontData->platformData());
ASSERT(it != gFontDataCache->end());
+ if (it == gFontDataCache->end())
+ return;
ASSERT(it->second.second);
if (!--it->second.second)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
