Changeset 58474 in webkit

Timestamp:

Apr 28, 2010 9:23:52 PM (14 years ago)

Author:

mitz@apple.com

Message:

Try to fix test failures seen on the Leopard build bot after r58467

Rubber-stamped by Maciej Stachowiak.

• platform/graphics/SimpleFontData.cpp:

(WebCore::SimpleFontData::platformGlyphInit): Initialize m_zeroWidthSpaceGlyph before
calling widthForGlyph(), as the latter uses the former.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/SimpleFontData.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-28  Dan Bernstein  <mitz@apple.com>
+
+        Rubber-stamped by Maciej Stachowiak.
+
+        Try to fix test failures seen on the Leopard build bot after r58467
+
+        * platform/graphics/SimpleFontData.cpp:
+        (WebCore::SimpleFontData::platformGlyphInit): Initialize m_zeroWidthSpaceGlyph before
+        calling widthForGlyph(), as the latter uses the former.
+
 2010-04-28  Martin Robinson  <mrobinson@webkit.org>
 

trunk/WebCore/platform/graphics/SimpleFontData.cpp

@@ -144 +144 @@
     }
 
+    m_zeroWidthSpaceGlyph = glyphPageZero->glyphDataForCharacter(0).glyph;
+
     // Nasty hack to determine if we should round or ceil space widths.
     // If the font is monospace or fake monospace we ceil to ensure that 
@@ -158 +160 @@
     // Ask for the glyph for 0 to avoid paging in ZERO WIDTH SPACE. Control characters, including 0,
     // are mapped to the ZERO WIDTH SPACE glyph.
-    m_zeroWidthSpaceGlyph = glyphPageZero->glyphDataForCharacter(0).glyph;
     if (m_zeroWidthSpaceGlyph == m_spaceGlyph) {
         m_zeroWidthSpaceGlyph = 0;