Changeset 95070 in webkit

Timestamp:

Sep 13, 2011 6:58:25 PM (13 years ago)

Author:

bashi@chromium.org

Message:

WebFont followed tiny monospace text displays weird
​https://bugs.webkit.org/show_bug.cgi?id=67996

Reviewed by Darin Adler.

Source/WebCore:

Always call wkSetCGFontRenderingMode() in Font::drawGlyphs() so that the rendering mode is set correctly.

Test: platform/mac/fast/text/webfont-after-tiny-monospace-text.html

• platform/graphics/mac/FontMac.mm:

(WebCore::Font::drawGlyphs):

LayoutTests:

This test ensures that webfont followed tiny monospace text is displayed correctly.

• platform/mac/fast/text/webfont-after-tiny-monospace-text-expected.png: Added.
• platform/mac/fast/text/webfont-after-tiny-monospace-text-expected.txt: Added.
• platform/mac/fast/text/webfont-after-tiny-monospace-text.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/webfont-after-tiny-monospace-text-expected.png (added)
• LayoutTests/platform/mac/fast/text/webfont-after-tiny-monospace-text-expected.txt (added)
• LayoutTests/platform/mac/fast/text/webfont-after-tiny-monospace-text.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/FontMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-13  Kenichi Ishibashi  <bashi@chromium.org>
+
+        WebFont followed tiny monospace text displays weird
+        https://bugs.webkit.org/show_bug.cgi?id=67996
+
+        Reviewed by Darin Adler.
+
+        This test ensures that webfont followed tiny monospace text is displayed correctly.
+
+        * platform/mac/fast/text/webfont-after-tiny-monospace-text-expected.png: Added.
+        * platform/mac/fast/text/webfont-after-tiny-monospace-text-expected.txt: Added.
+        * platform/mac/fast/text/webfont-after-tiny-monospace-text.html: Added.
+
 2011-09-13  Tom Sepez  <tsepez@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-13  Kenichi Ishibashi  <bashi@chromium.org>
+
+        WebFont followed tiny monospace text displays weird
+        https://bugs.webkit.org/show_bug.cgi?id=67996
+
+        Reviewed by Darin Adler.
+
+        Always call wkSetCGFontRenderingMode() in Font::drawGlyphs() so that the rendering mode is set correctly.
+
+        Test: platform/mac/fast/text/webfont-after-tiny-monospace-text.html
+
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::Font::drawGlyphs):
+
 2011-09-13  Tom Sepez  <tsepez@chromium.org>
 

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

@@ -209 +209 @@
     CGContextSetTextMatrix(cgContext, matrix);
 
-    if (drawFont) {
-        wkSetCGFontRenderingMode(cgContext, drawFont);
+    wkSetCGFontRenderingMode(cgContext, drawFont);
+    if (drawFont)
         CGContextSetFontSize(cgContext, 1.0f);
-    } else
+    else
         CGContextSetFontSize(cgContext, platformData.m_size);