Title: [87551] branches/safari-534-branch/Source/WebCore
- Revision
- 87551
- Author
- mr...@apple.com
- Date
- 2011-05-27 13:43:22 -0700 (Fri, 27 May 2011)
Log Message
Merge r87524.
Modified Paths
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (87550 => 87551)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-27 20:39:28 UTC (rev 87550)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-27 20:43:22 UTC (rev 87551)
@@ -1,5 +1,24 @@
2011-05-27 Mark Rowe <mr...@apple.com>
+ Merge r87524.
+
+ 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-27 Mark Rowe <mr...@apple.com>
+
Merge r87361.
2011-05-25 James Simonsen <simon...@chromium.org>
Modified: branches/safari-534-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (87550 => 87551)
--- branches/safari-534-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2011-05-27 20:39:28 UTC (rev 87550)
+++ branches/safari-534-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2011-05-27 20:43:22 UTC (rev 87551)
@@ -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
