Title: [87524] trunk/Source/WebCore
- Revision
- 87524
- Author
- msab...@apple.com
- Date
- 2011-05-27 10:52:05 -0700 (Fri, 27 May 2011)
Log Message
2011-05-27 Michael Saboff <msab...@apple.com>
Reviewed by David Hyatt.
https://bugs.webkit.org/show_bug.cgi?id=61646
Duplicate Fonts Put in Font Cache on Mac Due to Duplicate CGFontRefs for Same Font
Change the platformIsEqual to just compare the m_font members if
either is not null.
No tests added - functionality unchanged, fixing memory abandonment.
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::platformIsEqual):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87523 => 87524)
--- trunk/Source/WebCore/ChangeLog 2011-05-27 17:39:53 UTC (rev 87523)
+++ trunk/Source/WebCore/ChangeLog 2011-05-27 17:52:05 UTC (rev 87524)
@@ -1,3 +1,18 @@
+2011-05-27 Michael Saboff <msab...@apple.com>
+
+ Reviewed by David Hyatt.
+
+ https://bugs.webkit.org/show_bug.cgi?id=61646
+ Duplicate Fonts Put in Font Cache on Mac Due to Duplicate CGFontRefs for Same Font
+
+ Change the platformIsEqual to just compare the m_font members if
+ either is not null.
+
+ No tests added - functionality unchanged, fixing memory abandonment.
+
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::platformIsEqual):
+
2011-05-25 Martin Robinson <mrobin...@igalia.com>
Reviewed by Dirk Schulze.
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (87523 => 87524)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2011-05-27 17:39:53 UTC (rev 87523)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2011-05-27 17:52:05 UTC (rev 87524)
@@ -106,8 +106,9 @@
bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const
{
- return m_font == other.m_font
- && m_cgFont == other.m_cgFont;
+ if (m_font || other.m_font)
+ return m_font == other.m_font;
+ return m_cgFont == other.m_cgFont;
}
void FontPlatformData::setFont(NSFont *font)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
