Title: [87696] trunk
- Revision
- 87696
- Author
- commit-qu...@webkit.org
- Date
- 2011-05-30 13:08:51 -0700 (Mon, 30 May 2011)
Log Message
2011-05-30 Martin Robinson <mrobin...@igalia.com>
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-05-30 Martin Robinson <mrobin...@igalia.com>
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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (87695 => 87696)
--- trunk/LayoutTests/ChangeLog 2011-05-30 19:02:21 UTC (rev 87695)
+++ trunk/LayoutTests/ChangeLog 2011-05-30 20:08:51 UTC (rev 87696)
@@ -1,3 +1,12 @@
+2011-05-30 Martin Robinson <mrobin...@igalia.com>
+
+ 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-05-30 Gavin Peters <gav...@chromium.org>
Reviewed by Adam Barth.
Modified: trunk/LayoutTests/platform/gtk/Skipped (87695 => 87696)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-05-30 19:02:21 UTC (rev 87695)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-05-30 20:08:51 UTC (rev 87696)
@@ -197,10 +197,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=60158
fast/dom/Geolocation/argument-types.html
-# Crash related to 0 pixel fonts.
-# https://bugs.webkit.org/show_bug.cgi?id=61693
-fast/css/font-face-zero-hash-key.html
-
###############################################################################
# EXPECTED FAILURES
###############################################################################
Modified: trunk/Source/WebCore/ChangeLog (87695 => 87696)
--- trunk/Source/WebCore/ChangeLog 2011-05-30 19:02:21 UTC (rev 87695)
+++ trunk/Source/WebCore/ChangeLog 2011-05-30 20:08:51 UTC (rev 87696)
@@ -1,3 +1,21 @@
+2011-05-30 Martin Robinson <mrobin...@igalia.com>
+
+ 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-05-30 Noam Rosenthal <noam.rosent...@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (87695 => 87696)
--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2011-05-30 19:02:21 UTC (rev 87695)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2011-05-30 20:08:51 UTC (rev 87696)
@@ -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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
