Title: [88118] releases/WebKitGTK/webkit-1.4
Diff
Modified: releases/WebKitGTK/webkit-1.4/LayoutTests/ChangeLog (88117 => 88118)
--- releases/WebKitGTK/webkit-1.4/LayoutTests/ChangeLog 2011-06-04 17:45:42 UTC (rev 88117)
+++ releases/WebKitGTK/webkit-1.4/LayoutTests/ChangeLog 2011-06-04 18:18:28 UTC (rev 88118)
@@ -1,3 +1,12 @@
+2011-06-04 Martin Robinson <[email protected]>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] fast/css/font-face-zero-hash-key.html is crashing on the bots
+ https://bugs.webkit.org/show_bug.cgi?id=61693
+
+ * platform/gtk/Skipped: Unskip the test which is no longer crashing.
+
2011-06-03 Martin Robinson <[email protected]>
Reviewed by Dirk Schulze.
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog (88117 => 88118)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-04 17:45:42 UTC (rev 88117)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/ChangeLog 2011-06-04 18:18:28 UTC (rev 88118)
@@ -1,3 +1,21 @@
+2011-06-04 Martin Robinson <[email protected]>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] fast/css/font-face-zero-hash-key.html is crashing on the bots
+ https://bugs.webkit.org/show_bug.cgi?id=61693
+
+ Do not try to read the FT_Face from m_scaledFont if it m_scaledFont is
+ null. A recent change fixing 0-pixel-size fonts means that m_scaledFont
+ may now be null.
+
+ No new tests. This change should cause fast/css/font-face-zero-hash-key.html
+ to stop crashing.
+
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+ (WebCore::FontPlatformData::FontPlatformData): Do a null check before accessing
+ m_scaledFont.
+
2011-06-03 Martin Robinson <[email protected]>
Reviewed by Dirk Schulze.
Modified: releases/WebKitGTK/webkit-1.4/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (88117 => 88118)
--- releases/WebKitGTK/webkit-1.4/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2011-06-04 17:45:42 UTC (rev 88117)
+++ releases/WebKitGTK/webkit-1.4/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2011-06-04 18:18:28 UTC (rev 88118)
@@ -152,15 +152,18 @@
, m_size(size)
, m_syntheticBold(bold)
, m_syntheticOblique(italic)
+ , m_fixedWidth(false)
, m_font(fontFace)
, m_scaledFont(0)
{
initializeWithFontFace(fontFace);
- FT_Face fontConfigFace = cairo_ft_scaled_font_lock_face(m_scaledFont);
- if (fontConfigFace) {
- m_fixedWidth = fontConfigFace->face_flags & FT_FACE_FLAG_FIXED_WIDTH;
- cairo_ft_scaled_font_unlock_face(m_scaledFont);
+ if (m_scaledFont) {
+ FT_Face fontConfigFace = cairo_ft_scaled_font_lock_face(m_scaledFont);
+ if (fontConfigFace) {
+ m_fixedWidth = fontConfigFace->face_flags & FT_FACE_FLAG_FIXED_WIDTH;
+ cairo_ft_scaled_font_unlock_face(m_scaledFont);
+ }
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
