REGRESSION(91209?): fast/css/custom-font-xheight.html is failing on Leopard

https://bugs.webkit.org/show_bug.cgi?id=64767

Reviewed by Sam Weinig.

* platform/graphics/Font.h:
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::ctFont): Undo the cascade list optimization on Leopard for custom
fonts, because adding a cascade list apparently breaks the font.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@91229 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a5290f16fce5de90dd9559d728842627c0dabca0..1f782c75ddda30ce2d04c2f73236460f0f89a0af 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-18  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION(91209?): fast/css/custom-font-xheight.html is failing on Leopard
+        https://bugs.webkit.org/show_bug.cgi?id=64767
+
+        Reviewed by Sam Weinig.
+
+        * platform/graphics/Font.h:
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        (WebCore::FontPlatformData::ctFont): Undo the cascade list optimization on Leopard for custom
+        fonts, because adding a cascade list apparently breaks the font.
+
 2011-07-18  Matthew Delaney  <mdelaney@apple.com>
 
         Remove drawsUsingCopy now that all ports handle the copying

diff --git a/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
index aa5be1ad7b8ee7b79b153773916c2f58abe3754e..c4afb444bff7159d5468d2568fb9b7372684a5ba 100644 (file)
--- a/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
+++ b/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
@@ -200,8 +200,13 @@ CTFontRef FontPlatformData::ctFont() const
     m_CTFont = toCTFontRef(m_font);
     if (m_CTFont)
         m_CTFont.adoptCF(CTFontCreateCopyWithAttributes(m_CTFont.get(), m_size, 0, cascadeToLastResortFontDescriptor()));
-    else
+    else {
+#if !defined(BUILDING_ON_LEOPARD)
         m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, cascadeToLastResortFontDescriptor()));
+#else
+        m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, 0);
+#endif
+    }
 
     if (m_widthVariant != RegularWidth) {
         int featureTypeValue = kTextSpacingType;