Changeset 131995 in webkit

Timestamp:

Oct 20, 2012 6:57:13 PM (12 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/12512710> [mac] Text with zero font size renders as 12px sometimes
​https://bugs.webkit.org/show_bug.cgi?id=99918

Reviewed by Geoff Garen.

Source/WebCore:

-[NSFont fontWithName:size:] returns an NSFont of size 12 (the default User Font size) when
asked for size 0, and this is what Font::drawGlyphs uses to draw the text.

Test: fast/text/zero-font-size-2.html

• platform/graphics/mac/FontMac.mm:

(WebCore::Font::drawGlyphs): Added an early return if the size is zero.

LayoutTests:

• fast/text/zero-font-size-2-expected.html: Added.
• fast/text/zero-font-size-2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/zero-font-size-2-expected.html (added)
• LayoutTests/fast/text/zero-font-size-2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/FontMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-20  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/12512710> [mac] Text with zero font size renders as 12px sometimes
+        https://bugs.webkit.org/show_bug.cgi?id=99918
+
+        Reviewed by Geoff Garen.
+
+        * fast/text/zero-font-size-2-expected.html: Added.
+        * fast/text/zero-font-size-2.html: Added.
+
 2012-10-20  Florin Malita  <fmalita@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-20  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/12512710> [mac] Text with zero font size renders as 12px sometimes
+        https://bugs.webkit.org/show_bug.cgi?id=99918
+
+        Reviewed by Geoff Garen.
+
+        -[NSFont fontWithName:size:] returns an NSFont of size 12 (the default User Font size) when
+        asked for size 0, and this is what Font::drawGlyphs uses to draw the text.
+
+        Test: fast/text/zero-font-size-2.html
+
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::Font::drawGlyphs): Added an early return if the size is zero.
+
 2012-10-20  Andreas Kling  <kling@webkit.org>
 

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

@@ -140 +140 @@
 void Font::drawGlyphs(GraphicsContext* context, const SimpleFontData* font, const GlyphBuffer& glyphBuffer, int from, int numGlyphs, const FloatPoint& point) const
 {
+    if (!font->platformData().size())
+        return;
+
     CGContextRef cgContext = context->platformContext();