Title: [200545] trunk/Source/WebCore
- Revision
- 200545
- Author
- [email protected]
- Date
- 2016-05-07 13:02:44 -0700 (Sat, 07 May 2016)
Log 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 <[email protected]> on 2016-05-07
Reviewed by Myles C. Maxfield.
* platform/graphics/FontPlatformData.h:
(WebCore::FontPlatformData::hash):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200544 => 200545)
--- trunk/Source/WebCore/ChangeLog 2016-05-07 16:51:58 UTC (rev 200544)
+++ trunk/Source/WebCore/ChangeLog 2016-05-07 20:02:44 UTC (rev 200545)
@@ -1,3 +1,13 @@
+2016-05-07 Jeremy Huddleston Sequoia <[email protected]>
+
+ 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 <[email protected]>
REGRESSION(r196222): [AX][GTK] accessibility/gtk/caret-offsets.html failing
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (200544 => 200545)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2016-05-07 16:51:58 UTC (rev 200544)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2016-05-07 20:02:44 UTC (rev 200545)
@@ -167,9 +167,11 @@
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)
uintptr_t fontHash = (uintptr_t)m_font.get();
@@ -178,8 +180,8 @@
#endif
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
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
