Skip to content
Permalink
Browse files
2011-05-30 Martin Robinson <mrobinson@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  <mrobinson@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.

Canonical link: https://commits.webkit.org/77179@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@87696 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed May 30, 2011
1 parent bead867 commit 3f9cd9c687a3ee8537a43d67d046c90503f612f2
Showing with 34 additions and 8 deletions.
  1. +9 −0 LayoutTests/ChangeLog
  2. +0 −4 LayoutTests/platform/gtk/Skipped
  3. +18 −0 Source/WebCore/ChangeLog
  4. +7 −4 Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp
@@ -1,3 +1,12 @@
2011-05-30 Martin Robinson <mrobinson@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 <gavinp@chromium.org>

Reviewed by Adam Barth.
@@ -197,10 +197,6 @@ storage/open-database-set-empty-version.html
# 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
###############################################################################
@@ -1,3 +1,21 @@
2011-05-30 Martin Robinson <mrobinson@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.rosenthal@nokia.com>

Reviewed by Kenneth Rohde Christiansen.
@@ -152,15 +152,18 @@ FontPlatformData::FontPlatformData(cairo_font_face_t* fontFace, float size, bool
, 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);
}
}
}

0 comments on commit 3f9cd9c

Please sign in to comment.