Changeset 63556 in webkit

Timestamp:

Jul 16, 2010 9:08:38 AM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/8198266> white-space: pre text containing tabs is not laid out correctly when the font lacks a space glyph
​https://bugs.webkit.org/show_bug.cgi?id=42437

Reviewed by Anders Carlsson.

No test because none of the fonts available to DumpRenderTree are missing a space glyph.

Changed the tab width computation to use the width of the space glyph from the font that has
a space glyph, which may be a fallback font if the primary font lacks a space glyph.

• platform/graphics/Font.h: Removed Font::tabWidth().
• platform/graphics/WidthIterator.cpp:

(WebCore::WidthIterator::advance):

• platform/graphics/mac/ComplexTextController.cpp:

(WebCore::ComplexTextController::adjustGlyphsAndAdvances):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Font.h (modified) (1 diff)
• platform/graphics/WidthIterator.cpp (modified) (1 diff)
• platform/graphics/mac/ComplexTextController.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-16  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        <rdar://problem/8198266> white-space: pre text containing tabs is not laid out correctly when the font lacks a space glyph
+        https://bugs.webkit.org/show_bug.cgi?id=42437
+
+        No test because none of the fonts available to DumpRenderTree are missing a space glyph.
+
+        Changed the tab width computation to use the width of the space glyph from the font that has
+        a space glyph, which may be a fallback font if the primary font lacks a space glyph.
+
+        * platform/graphics/Font.h: Removed Font::tabWidth().
+        * platform/graphics/WidthIterator.cpp:
+        (WebCore::WidthIterator::advance):
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
+
 2010-07-16  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/platform/graphics/Font.h

@@ -136 +136 @@
     unsigned unitsPerEm() const { return primaryFont()->unitsPerEm(); }
     int spaceWidth() const { return (int)ceilf(primaryFont()->adjustedSpaceWidth() + m_letterSpacing); }
-    int tabWidth() const { return 8 * spaceWidth(); }
 
     const SimpleFontData* primaryFont() const;

trunk/WebCore/platform/graphics/WidthIterator.cpp

@@ -134 +134 @@
         float width;
         if (c == '\t' && m_run.allowTabs()) {
-            float tabWidth = m_font->tabWidth();
+            float tabWidth = 8 * ceilf(fontData->adjustedSpaceWidth() + m_font->letterSpacing());
             width = tabWidth - fmodf(m_run.xPos() + m_runWidthSoFar + widthSinceLastRounding, tabWidth);
         } else {

trunk/WebCore/platform/graphics/mac/ComplexTextController.cpp

@@ -475 +475 @@
 
             if (ch == '\t' && m_run.allowTabs()) {
-                float tabWidth = m_font.tabWidth();
+                float tabWidth = 8 * ceilf(fontData->adjustedSpaceWidth() + m_font.letterSpacing());
                 advance.width = tabWidth - fmodf(m_run.xPos() + m_totalWidth + widthSinceLastRounding, tabWidth);
             } else if (ch == zeroWidthSpace || Font::treatAsZeroWidthSpace(ch) && !treatAsSpace) {