Changeset 91237 in webkit

Timestamp:

Jul 18, 2011 9:14:42 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(91209?): fast/css/custom-font-xheight.html is failing on Leopard
​https://bugs.webkit.org/show_bug.cgi?id=64767

Add a runtime check for font cascading optimization.

It's a constant value in Mac port so hopefully gcc will constant-propagate the value
and eliminate the function altogether.

• platform/graphics/cocoa/FontPlatformDataCocoa.mm:

(WebCore::canSetCascadeListForCustomFont): Added.
(WebCore::FontPlatformData::ctFont):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/FontPlatformDataCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(91209?): fast/css/custom-font-xheight.html is failing on Leopard
+        https://bugs.webkit.org/show_bug.cgi?id=64767
+
+        Add a runtime check for font cascading optimization.
+
+        It's a constant value in Mac port so hopefully gcc will constant-propagate the value
+        and eliminate the function altogether.
+
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        (WebCore::canSetCascadeListForCustomFont): Added.
+        (WebCore::FontPlatformData::ctFont):
+
 2011-07-18  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm

@@ -193 +193 @@
 }
 
+// Adding a cascade list breaks the font on Leopard
+static bool canSetCascadeListForCustomFont()
+{
+#if PLATFORM(CHROMIUM)
+    static SInt32 systemVersion;
+    if (!systemVersion) {
+        if (Gestalt(gestaltSystemVersion, &systemVersion) != noErr)
+            return false;
+    }
+
+    return systemVersion >= 0x1060;
+#elif !defined(BUILDING_ON_LEOPARD)
+    return true;
+#else
+    return false;
+#endif
+}
+
 CTFontRef FontPlatformData::ctFont() const
 {
@@ -201 +219 @@
     if (m_CTFont)
         m_CTFont.adoptCF(CTFontCreateCopyWithAttributes(m_CTFont.get(), m_size, 0, cascadeToLastResortFontDescriptor()));
-    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
-    }
+    else
+        m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, canSetCascadeListForCustomFont() ? cascadeToLastResortFontDescriptor() : 0));
 
     if (m_widthVariant != RegularWidth) {