diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp')
| -rw-r--r-- | chromium/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp b/chromium/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp index 3744cd2f233..ed0de7eab07 100644 --- a/chromium/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp +++ b/chromium/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp @@ -37,11 +37,11 @@ namespace WebCore { -#if (!ENABLE(GDI_FONTS_ON_WINDOWS) || !OS(WIN)) && !OS(MACOSX) +#if !OS(MACOSX) unsigned FontPlatformData::hash() const { unsigned h = SkTypeface::UniqueID(m_typeface.get()); - h ^= 0x01010101 * ((static_cast<int>(m_orientation) << 2) | (static_cast<int>(m_fakeBold) << 1) | static_cast<int>(m_fakeItalic)); + h ^= 0x01010101 * ((static_cast<int>(m_orientation) << 2) | (static_cast<int>(m_syntheticBold) << 1) | static_cast<int>(m_syntheticItalic)); // This memcpy is to avoid a reinterpret_cast that breaks strict-aliasing // rules. Memcpy is generally optimized enough so that performance doesn't |