Changeset 31424

Timestamp:

03/28/08 19:21:00 (15 months ago)

Author:

hyatt@apple.com

Message:

2008-03-28 David Hyatt < hyatt@apple.com>

Back out the Ahem font antialiasing hack, since it is now no longer required for LCD antialiased text
to match the reference rendering on Acid 3.

• platform/graphics/SimpleFontData.h:
• platform/graphics/mac/FontMac.mm: (WebCore::Font::drawGlyphs):
• platform/graphics/mac/SimpleFontDataMac.mm: (WebCore::SimpleFontData::platformInit):
• platform/graphics/win/FontCGWin.cpp: (WebCore::Font::drawGlyphs):
• platform/graphics/win/SimpleFontDataCGWin.cpp: (WebCore::SimpleFontData::platformInit):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::positionNewFloats):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/SimpleFontData.h (modified) (1 diff)
• platform/graphics/mac/FontMac.mm (modified) (1 diff)
• platform/graphics/mac/SimpleFontDataMac.mm (modified) (2 diffs)
• platform/graphics/win/FontCGWin.cpp (modified) (1 diff)
• platform/graphics/win/SimpleFontDataCGWin.cpp (modified) (2 diffs)
• rendering/RenderBlock.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-28  David Hyatt  <hyatt@apple.com>
+
+        Back out the Ahem font antialiasing hack, since it is now no longer required for LCD antialiased text
+        to match the reference rendering on Acid 3.
+
+        * platform/graphics/SimpleFontData.h:
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::Font::drawGlyphs):
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::platformInit):
+        * platform/graphics/win/FontCGWin.cpp:
+        (WebCore::Font::drawGlyphs):
+        * platform/graphics/win/SimpleFontDataCGWin.cpp:
+        (WebCore::SimpleFontData::platformInit):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::positionNewFloats):
+
 2008-03-28  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/platform/graphics/SimpleFontData.h

@@ -162 +162 @@
 #if PLATFORM(CG)
     float m_syntheticBoldOffset;
-    bool m_allowFontSmoothing;
 #endif
 

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

@@ -639 +639 @@
 
     bool originalShouldUseFontSmoothing = wkCGContextGetShouldSmoothFonts(cgContext);
-    bool newShouldUseFontSmoothing = WebCoreShouldUseFontSmoothing() && font->m_allowFontSmoothing;
+    bool newShouldUseFontSmoothing = WebCoreShouldUseFontSmoothing();
     
     if (originalShouldUseFontSmoothing != newShouldUseFontSmoothing)

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

@@ -149 +149 @@
 
     m_syntheticBoldOffset = m_font.m_syntheticBold ? 1.0f : 0.f;
-    m_allowFontSmoothing = true;
 
     bool failedSetup = false;
@@ -258 +257 @@
     } else
         m_xHeight = [m_font.font() xHeight];
-
-    // Workaround for strange CG antialiasing of the Ahem font. Limit to the Web font version.
-    if (isCustomFont()) {
-#ifdef BUILDING_ON_TIGER
-        RetainPtr<CFStringRef> fullName(AdoptCF, wkCopyFullFontName(m_font.cgFont()));
-#else
-        RetainPtr<CFStringRef> fullName(AdoptCF, CGFontCopyFullName(m_font.cgFont()));
-#endif
-        String nameStr(fullName.get());
-        m_allowFontSmoothing = (nameStr != "Ahem");
-    }
 }
 

trunk/WebCore/platform/graphics/win/FontCGWin.cpp

@@ -267 +267 @@
     CGContextRef cgContext = graphicsContext->platformContext();
 
-    uint32_t oldFontSmoothingStyle = wkSetFontSmoothingStyle(cgContext, font->m_allowFontSmoothing);
+    uint32_t oldFontSmoothingStyle = wkSetFontSmoothingStyle(cgContext, true);
 
     const FontPlatformData& platformData = font->platformData();

trunk/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp

@@ -54 +54 @@
 {
     m_syntheticBoldOffset = m_font.syntheticBold() ? 1.0f : 0.f;
-    m_allowFontSmoothing = true;
     m_scriptCache = 0;
     m_scriptFontProperties = 0;
@@ -116 +115 @@
         m_xHeight = scaleEmToUnits(iXHeight, m_unitsPerEm) * pointSize;
     }
-    
-    // Workaround for strange CG antialiasing of the Ahem font. Limit to the Web font version.
-    if (isCustomFont()) {
-        RetainPtr<CFStringRef> fullName(AdoptCF, CGFontCopyFullName(m_font.cgFont()));
-        String nameStr(fullName.get());
-        m_allowFontSmoothing = (nameStr != "Ahem");
-    }
 }
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -2230 +2230 @@
                 fx = rightRelOffset(y, ro, false, &heightRemainingRight);
             }
-            fx = max(f->m_width, fx);
             f->m_left = fx - f->m_width;
             o->setPos(fx - o->marginRight() - o->width(), y + o->marginTop());