Changeset 89248 in webkit

Timestamp:

Jun 20, 2011 8:50:29 AM (13 years ago)

Author:

Martin Robinson

Message:

2011-06-19 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] ASSERTION FAILED: it != gFontDataCache->end() in FontCache.cpp:318
​https://bugs.webkit.org/show_bug.cgi?id=62942

Fix the == operator overload of the FreeType FontPlatformData to properly make the
distinction between the hash table deleted value and the hash table empty value.

No new tests. This is covered by existing tests, which should no longer
hit assertions.

• platform/graphics/freetype/FontPlatformDataFreeType.cpp: (WebCore::FontPlatformData::operator==): Reorder the logic for determining if two FontPlatformData instances are equal. Do a pointer comparison on the Fontconfig patterns, instead of using FcPatternEqual. If the two Fontconfig patterns have different pointers they were created at different times and the overload should return false.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/freetype/FontPlatformDataFreeType.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-19  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] ASSERTION FAILED: it != gFontDataCache->end() in FontCache.cpp:318
+        https://bugs.webkit.org/show_bug.cgi?id=62942
+
+        Fix the == operator overload of the FreeType FontPlatformData to properly make the
+        distinction between the hash table deleted value and the hash table empty value.
+
+        No new tests. This is covered by existing tests, which should no longer
+        hit assertions.
+
+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+        (WebCore::FontPlatformData::operator==): Reorder the logic for determining if two
+        FontPlatformData instances are equal. Do a pointer comparison on the Fontconfig patterns,
+        instead of using FcPatternEqual. If the two Fontconfig patterns have different pointers
+        they were created at different times and the overload should return false.
+
 2011-06-20  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp

@@ -229 +229 @@
 bool FontPlatformData::operator==(const FontPlatformData& other) const
 {
-    if (m_pattern == other.m_pattern)
-        return true;
-    if (!m_pattern || !other.m_pattern)
-        return false;
-    return FcPatternEqual(m_pattern.get(), other.m_pattern.get())
-        && m_scaledFont == other.m_scaledFont && m_font == other.m_font && m_size == other.m_size
-        && m_syntheticOblique == other.m_syntheticOblique && m_syntheticBold == other.m_syntheticBold; 
+    return m_pattern == other.m_pattern
+        && m_scaledFont == other.m_scaledFont
+        && m_font == other.m_font
+        && m_size == other.m_size
+        && m_syntheticOblique == other.m_syntheticOblique
+        && m_syntheticBold == other.m_syntheticBold; 
 }