Changeset 87524 in webkit


Ignore:
Timestamp:
May 27, 2011 10:52:05 AM (13 years ago)
Author:
msaboff@apple.com
Message:

2011-05-27 Michael Saboff <msaboff@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):
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r87523 r87524  
     12011-05-27  Michael Saboff  <msaboff@apple.com>
     2
     3        Reviewed by David Hyatt.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=61646
     6        Duplicate Fonts Put in Font Cache on Mac Due to Duplicate CGFontRefs for Same Font
     7
     8        Change the platformIsEqual to just compare the m_font members if
     9        either is not null.
     10
     11        No tests added - functionality unchanged, fixing memory abandonment.
     12
     13        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
     14        (WebCore::FontPlatformData::platformIsEqual):
     15
    1162011-05-25  Martin Robinson  <mrobinson@igalia.com>
    217
  • trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm

    r85036 r87524  
    107107bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const
    108108{
    109     return m_font == other.m_font
    110         && m_cgFont == other.m_cgFont;
     109    if (m_font || other.m_font)
     110        return m_font == other.m_font;
     111    return m_cgFont == other.m_cgFont;
    111112}
    112113
Note: See TracChangeset for help on using the changeset viewer.