Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / fonts / skia / FontPlatformDataSkia.cpp

diff --git a/src/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp b/src/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp
index e7d48b2..3f51a0b 100644 (file)
--- a/src/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp
+++ b/src/third_party/WebKit/Source/platform/fonts/skia/FontPlatformDataSkia.cpp
@@ -41,7 +41,7 @@ namespace blink {
 unsigned FontPlatformData::hash() const
 {
     unsigned h = SkTypeface::UniqueID(m_typeface.get());
-    h ^= 0x01010101 * ((static_cast<int>(m_orientation) << 2) | (static_cast<int>(m_syntheticBold) << 1) | static_cast<int>(m_syntheticItalic));
+    h ^= 0x01010101 * ((static_cast<int>(m_isHashTableDeletedValue) << 3) | (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