Changeset 87696 in webkit

Timestamp:

May 30, 2011 1:08:51 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -197 +197 @@
 # 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
 
 ###############################################################################

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

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

@@ -153 +153 @@
     , m_syntheticBold(bold)
     , m_syntheticOblique(italic)
+    , m_fixedWidth(false)
     , m_font(fontFace)
     , m_scaledFont(0)
@@ -158 +159 @@
     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);
+        }
     }
 }