Changeset 98765 in webkit

Timestamp:

Oct 28, 2011, 2:41:43 PM (15 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/10288006> Emoji characters are too close to each other in small font size

Reviewed by Sam Weinig.

Source/WebCore:

• platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore::SimpleFontData::platformWidthForGlyph): If the font is a color bitmap font, use
-[NSFont advancementForGlyph:] instead of wkGetGlyphTransformedAdvances().

LayoutTests:

• platform/mac/fast/css/font-family-pictograph-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/css/font-family-pictograph-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-28  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10288006> Emoji characters are too close to each other in small font size
+
+        Reviewed by Sam Weinig.
+
+        * platform/mac/fast/css/font-family-pictograph-expected.txt:
+
 2011-10-28  Ken Buchanan <kenrb@chromium.org>
 

trunk/LayoutTests/platform/mac/fast/css/font-family-pictograph-expected.txt

@@ -5 +5 @@
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock {DIV} at (0,0) size 784x95
-        RenderText {#text} at (0,0) size 72x95
-          text run at (0,0) width 72: "\x{2665}"
+        RenderText {#text} at (0,0) size 73x95
+          text run at (0,0) width 73: "\x{2665}"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10288006> Emoji characters are too close to each other in small font size
+
+        Reviewed by Sam Weinig.
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::platformWidthForGlyph): If the font is a color bitmap font, use
+        -[NSFont advancementForGlyph:] instead of wkGetGlyphTransformedAdvances().
+
 2011-10-28  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

@@ -401 +401 @@
     CGSize advance = CGSizeZero;
     if (platformData().orientation() == Horizontal || m_isBrokenIdeographFallback) {
-        NSFont* font = platformData().font();
-        float pointSize = platformData().m_size;
-        CGAffineTransform m = CGAffineTransformMakeScale(pointSize, pointSize);
-        if (!wkGetGlyphTransformedAdvances(platformData().cgFont(), font, &m, &glyph, &advance)) {
-            LOG_ERROR("Unable to cache glyph widths for %@ %f", [font displayName], pointSize);
-            advance.width = 0;
+        NSFont *font = platformData().font();
+        if (font && platformData().isColorBitmapFont())
+            advance = [font advancementForGlyph:glyph];
+        else {
+            float pointSize = platformData().m_size;
+            CGAffineTransform m = CGAffineTransformMakeScale(pointSize, pointSize);
+            if (!wkGetGlyphTransformedAdvances(platformData().cgFont(), font, &m, &glyph, &advance)) {
+                LOG_ERROR("Unable to cache glyph widths for %@ %f", [font displayName], pointSize);
+                advance.width = 0;
+            }
         }
     } else