Changeset 200545 in webkit
- Timestamp:
- May 7, 2016 1:02:44 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r200542 r200545 1 2016-05-07 Jeremy Huddleston Sequoia <jeremyhu@apple.com> 2 3 Fix an incorrect usage of OS(DARWIN) with PLATFORM(COCOA) 4 https://bugs.webkit.org/show_bug.cgi?id=157167 5 6 Reviewed by Myles C. Maxfield. 7 8 * platform/graphics/FontPlatformData.h: 9 (WebCore::FontPlatformData::hash): 10 1 11 2016-05-07 Joanmarie Diggs <jdiggs@igalia.com> 2 12 -
trunk/Source/WebCore/platform/graphics/FontPlatformData.h
r200237 r200545 168 168 unsigned hash() const 169 169 { 170 #if PLATFORM(WIN) && !USE(CAIRO) 170 #if USE(CAIRO) 171 return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont.get()); 172 #elif PLATFORM(WIN) 171 173 return m_font ? m_font->hash() : 0; 172 #elif OS(DARWIN)174 #elif PLATFORM(COCOA) 173 175 uintptr_t flags = static_cast<uintptr_t>(m_isHashTableDeletedValue << 5 | m_textRenderingMode << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique); 174 176 #if USE(APPKIT) … … 179 181 uintptr_t hashCodes[3] = { fontHash, m_widthVariant, flags }; 180 182 return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes); 181 #el if USE(CAIRO)182 return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont.get()); 183 #else 184 #error "Unsupported configuration" 183 185 #endif 184 186 }
Note: See TracChangeset
for help on using the changeset viewer.