Changeset 200545 in webkit

Timestamp:

May 7, 2016 1:02:44 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Fix an incorrect usage of OS(DARWIN) with PLATFORM(COCOA)
​https://bugs.webkit.org/show_bug.cgi?id=157167

Patch by Jeremy Huddleston Sequoia <​jeremyhu@apple.com> on 2016-05-07
Reviewed by Myles C. Maxfield.

• platform/graphics/FontPlatformData.h:

(WebCore::FontPlatformData::hash):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontPlatformData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-07  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
+
+        Fix an incorrect usage of OS(DARWIN) with PLATFORM(COCOA)
+        https://bugs.webkit.org/show_bug.cgi?id=157167
+
+        Reviewed by Myles C. Maxfield.
+
+        * platform/graphics/FontPlatformData.h:
+        (WebCore::FontPlatformData::hash):
+
 2016-05-07  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Source/WebCore/platform/graphics/FontPlatformData.h

@@ -168 +168 @@
     unsigned hash() const
     {
-#if PLATFORM(WIN) && !USE(CAIRO)
+#if USE(CAIRO)
+        return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont.get());
+#elif PLATFORM(WIN)
         return m_font ? m_font->hash() : 0;
-#elif OS(DARWIN)
+#elif PLATFORM(COCOA)
         uintptr_t flags = static_cast<uintptr_t>(m_isHashTableDeletedValue << 5 | m_textRenderingMode << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique);
 #if USE(APPKIT)
@@ -179 +181 @@
         uintptr_t hashCodes[3] = { fontHash, m_widthVariant, flags };
         return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
-#elif USE(CAIRO)
-        return PtrHash<cairo_scaled_font_t*>::hash(m_scaledFont.get());
+#else
+#error "Unsupported configuration"
 #endif
     }