Title: [91229] trunk/Source/WebCore
- Revision
- 91229
- Author
- [email protected]
- Date
- 2011-07-18 18:21:02 -0700 (Mon, 18 Jul 2011)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91228 => 91229)
--- trunk/Source/WebCore/ChangeLog 2011-07-19 00:54:38 UTC (rev 91228)
+++ trunk/Source/WebCore/ChangeLog 2011-07-19 01:21:02 UTC (rev 91229)
@@ -1,3 +1,15 @@
+2011-07-18 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
Remove drawsUsingCopy now that all ports handle the copying
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (91228 => 91229)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2011-07-19 00:54:38 UTC (rev 91228)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2011-07-19 01:21:02 UTC (rev 91229)
@@ -200,8 +200,13 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
