Changeset 64915 in webkit

Timestamp:

Aug 7, 2010 11:59:43 AM (14 years ago)

Author:

mitz@apple.com

Message:

Created a separate SimpleFontData constructor exclusively for SVG fonts and moved the CTFontRef
from SimpleFontData to FontPlatformData.
​https://bugs.webkit.org/show_bug.cgi?id=43674

Reviewed by Anders Carlsson.

JavaScriptCore:

• wtf/Platform.h: Moved definitions of WTF_USE_CORE_TEXT and WTF_USE_ATSUI here from WebCore/config.h.

WebCore:

• config.h: Moved definitions of WTF_USE_CORE_TEXT and WTF_USE_ATSUI from here to wtf/Platform.h.
• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::getFontData): Use new SimpleFontData constructor for SVG fonts.

• platform/graphics/SimpleFontData.cpp:

(WebCore::SimpleFontData::SimpleFontData): Separated into two constructors, one for
PlatformFontData-based fonts and one for SVG fonts.

• platform/graphics/SimpleFontData.h: Moved the m_CTFont member variable and the getCTFont()

accessor from here…

• platform/graphics/mac/FontPlatformData.h: …to here, renaming the latter ctFont().
• platform/graphics/mac/FontPlatformDataMac.mm:

(WebCore::FontPlatformData::FontPlatformData): Copy m_CTFont.
(WebCore::FontPlatformData::operator=): Copy m_CTFont.
(WebCore::FontPlatformData::setFont): Clear m_CTFont.
(WebCore::FontPlatformData::ctFont): Moved here from SimpleFontDataCoreText.cpp and renamed.

• platform/graphics/mac/SimpleFontDataCoreText.cpp:

(WebCore::SimpleFontData::getCFStringAttributes): Updated to use FontPlatformData::ctFont().

• svg/SVGFontData.cpp:

(WebCore::SVGFontData::SVGFontData): Added an assertion.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (6 diffs)
• WebCore/config.h (modified) (1 diff)
• WebCore/css/CSSFontFaceSource.cpp (modified) (3 diffs)
• WebCore/platform/graphics/SimpleFontData.cpp (modified) (2 diffs)
• WebCore/platform/graphics/SimpleFontData.h (modified) (6 diffs)
• WebCore/platform/graphics/mac/FontPlatformData.h (modified) (3 diffs)
• WebCore/platform/graphics/mac/FontPlatformDataMac.mm (modified) (4 diffs)
• WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp (modified) (3 diffs)
• WebCore/svg/SVGFontData.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-08-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Created a separate SimpleFontData constructor exclusively for SVG fonts and moved the CTFontRef
+        from SimpleFontData to FontPlatformData.
+        https://bugs.webkit.org/show_bug.cgi?id=43674
+
+        * wtf/Platform.h: Moved definitions of WTF_USE_CORE_TEXT and WTF_USE_ATSUI here from WebCore/config.h.
+
 2010-08-07  Zoltan Herczeg  <zherczeg@webkit.org>
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -1033 +1033 @@
 #endif
 
+#if PLATFORM(MAC)
+/* Complex text framework */
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+#define WTF_USE_ATSUI 0
+#define WTF_USE_CORE_TEXT 1
+#else
+#define WTF_USE_ATSUI 1
+#define WTF_USE_CORE_TEXT 0
+#endif
+
 /* Accelerated compositing */
-#if PLATFORM(MAC)
 #if !defined(BUILDING_ON_TIGER)
 #define WTF_USE_ACCELERATED_COMPOSITING 1

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Created a separate SimpleFontData constructor exclusively for SVG fonts and moved the CTFontRef
+        from SimpleFontData to FontPlatformData.
+        https://bugs.webkit.org/show_bug.cgi?id=43674
+
+        * config.h: Moved definitions of WTF_USE_CORE_TEXT and WTF_USE_ATSUI from here to wtf/Platform.h.
+        * css/CSSFontFaceSource.cpp:
+        (WebCore::CSSFontFaceSource::getFontData): Use new SimpleFontData constructor for SVG fonts.
+        * platform/graphics/SimpleFontData.cpp:
+        (WebCore::SimpleFontData::SimpleFontData): Separated into two constructors, one for
+        PlatformFontData-based fonts and one for SVG fonts.
+        * platform/graphics/SimpleFontData.h: Moved the m_CTFont member variable and the getCTFont()
+        accessor from here…
+        * platform/graphics/mac/FontPlatformData.h: …to here, renaming the latter ctFont().
+        * platform/graphics/mac/FontPlatformDataMac.mm:
+        (WebCore::FontPlatformData::FontPlatformData): Copy m_CTFont.
+        (WebCore::FontPlatformData::operator=): Copy m_CTFont.
+        (WebCore::FontPlatformData::setFont): Clear m_CTFont.
+        (WebCore::FontPlatformData::ctFont): Moved here from SimpleFontDataCoreText.cpp and renamed.
+        * platform/graphics/mac/SimpleFontDataCoreText.cpp:
+        (WebCore::SimpleFontData::getCFStringAttributes): Updated to use FontPlatformData::ctFont().
+        * svg/SVGFontData.cpp:
+        (WebCore::SVGFontData::SVGFontData): Added an assertion.
+
 2010-08-07  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1424 +1424 @@
                 7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4A8A1131C2760035B883 /* ScriptBreakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 7AFD4FF4113277B60035B883 /* ScriptDebugListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AFD4FF3113277B60035B883 /* ScriptDebugListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                81BE209811F4AB8D00915DFA /* IDBCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81BE209311F4AB8D00915DFA /* IDBCursor.cpp */; };
                 81BE209711F4AB8D00915DFA /* IDBCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BE209211F4AB8D00915DFA /* IDBCursor.h */; };
                 81BE209811F4AB8D00915DFA /* IDBCursorBackendImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81BE209311F4AB8D00915DFA /* IDBCursorBackendImpl.cpp */; };
-                81BE209911F4AB8D00915DFA /* IDBCursorBackendImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BE209411F4AB8D00915DFA /* IDBCursorBackendImpl.h */; };
-                81BE209B11F4AB8D00915DFA /* IDBCursorBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BE209611F4AB8D00915DFA /* IDBCursorBackendInterface.h */; };
+                81BE209911F4AB8D00915DFA /* IDBCursorBackendInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BE209411F4AB8D00915DFA /* IDBCursorBackendInterface.h */; };
                 81BE20D211F4BC3200915DFA /* JSIDBCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 81BE20A711F4B66F00915DFA /* JSIDBCursor.cpp */; };
                 81BE20D311F4BC3200915DFA /* JSIDBCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BE20A811F4B66F00915DFA /* JSIDBCursor.h */; };
@@ -7260 +7258 @@
                 81BE209211F4AB8D00915DFA /* IDBCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursor.h; sourceTree = "<group>"; };
                 81BE209311F4AB8D00915DFA /* IDBCursorBackendImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBCursorBackendImpl.cpp; sourceTree = "<group>"; };
-                81BE209411F4AB8D00915DFA /* IDBCursorBackendImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorBackendImpl.h; sourceTree = "<group>"; };
                 81BE209411F4AB8D00915DFA /* IDBCursorBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBCursorBackendInterface.h; sourceTree = "<group>"; };
                 81BE209C11F4ABBD00915DFA /* IDBCursor.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBCursor.idl; sourceTree = "<group>"; };
@@ -10098 +10095 @@
                 B6566269120B115A006EA85C /* IDBTransaction.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IDBTransaction.idl; sourceTree = "<group>"; };
                 B656626D120B116B006EA85C /* IDBTransactionBackendInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBTransactionBackendInterface.h; sourceTree = "<group>"; };
-                B656626E120B1227006EA85C /* JSIDBTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSIDBTransaction.h; path = JSIDBTransaction.h; sourceTree = "<group>"; };
-                B656626F120B1227006EA85C /* JSIDBTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSIDBTransaction.cpp; path = JSIDBTransaction.cpp; sourceTree = "<group>"; };
+                B656626E120B1227006EA85C /* JSIDBTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBTransaction.h; sourceTree = "<group>"; };
+                B656626F120B1227006EA85C /* JSIDBTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSIDBTransaction.cpp; sourceTree = "<group>"; };
                 B734B180119B9911006587BD /* FontTranscoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontTranscoder.cpp; path = transcoder/FontTranscoder.cpp; sourceTree = "<group>"; };
                 B734B182119B991D006587BD /* FontTranscoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontTranscoder.h; path = transcoder/FontTranscoder.h; sourceTree = "<group>"; };
@@ -11469 +11466 @@
                                 C585A69A11D4FB3D004C3E4B /* IDBAny.idl */,
                                 C585A69B11D4FB3D004C3E4B /* IDBCallbacks.h */,
-                                81BE209211F4AB8D00915DFA /* IDBCursor.cpp */,
+                                81BE209211F4AB8D00915DFA /* IDBCursor.h */,
                                 81BE209211F4AB8D00915DFA /* IDBCursor.h */,
                                 81BE209C11F4ABBD00915DFA /* IDBCursor.idl */,
                                 81BE209311F4AB8D00915DFA /* IDBCursorBackendImpl.cpp */,
-                                81BE209411F4AB8D00915DFA /* IDBCursorBackendImpl.h */,
-                                81BE209511F4AB8D00915DFA /* IDBCursorBackendInterface.h */,
+                                81BE209411F4AB8D00915DFA /* IDBCursorBackendInterface.h */,
                                 C585A6A311D4FB3D004C3E4B /* IDBDatabase.cpp */,
                                 C585A6A411D4FB3D004C3E4B /* IDBDatabase.h */,
@@ -18716 +18712 @@
                                 C585A6CF11D4FB3D004C3E4B /* IDBCallbacks.h in Headers */,
                                 81BE209711F4AB8D00915DFA /* IDBCursor.h in Headers */,
-                                81BE209911F4AB8D00915DFA /* IDBCursorBackendImpl.h in Headers */,
-                                81BE209B11F4AB8D00915DFA /* IDBCursorBackendInterface.h in Headers */,
+                                81BE209911F4AB8D00915DFA /* IDBCursorBackendInterface.h in Headers */,
                                 C585A6D811D4FB3D004C3E4B /* IDBDatabase.h in Headers */,
                                 B61762621203490800EF9114 /* IDBDatabaseBackendImpl.h in Headers */,
@@ -21166 +21161 @@
                                 C585A6CC11D4FB3D004C3E4B /* IDBAny.cpp in Sources */,
                                 C585A66211D4FAC5004C3E4B /* IDBBindingUtilities.cpp in Sources */,
-                                81BE209811F4AB8D00915DFA /* IDBCursor.cpp in Sources */,
+                                81BE209811F4AB8D00915DFA /* IDBCursorBackendImpl.cpp in Sources */,
                                 81BE209811F4AB8D00915DFA /* IDBCursorBackendImpl.cpp in Sources */,
                                 B691C1F91206D4A00025D980 /* IDBDatabase.cpp in Sources */,

trunk/WebCore/config.h

@@ -156 +156 @@
 
 #if PLATFORM(MAC)
-// ATSUI vs. CoreText
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
-#define WTF_USE_ATSUI 0
-#define WTF_USE_CORE_TEXT 1
-#else
-#define WTF_USE_ATSUI 1
-#define WTF_USE_CORE_TEXT 0
-#endif
-
 // New theme
 #define WTF_USE_NEW_THEME 1

trunk/WebCore/css/CSSFontFaceSource.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -154 +154 @@
                     }
 
-                    SVGFontData* svgFontData = new SVGFontData(fontFaceElement);
-                    fontData.set(new SimpleFontData(m_font->platformDataFromCustomData(fontDescription.computedPixelSize(), syntheticBold, syntheticItalic, fontDescription.renderingMode()), true, false, svgFontData));
+                    fontData.set(new SimpleFontData(adoptPtr(new SVGFontData(fontFaceElement)), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic));
                 }
             } else
@@ -169 +168 @@
 #if ENABLE(SVG_FONTS)
             // In-Document SVG Fonts
-            if (m_svgFontFaceElement) {
-                SVGFontData* svgFontData = new SVGFontData(m_svgFontFaceElement);
-                fontData.set(new SimpleFontData(FontPlatformData(fontDescription.computedPixelSize(), syntheticBold, syntheticItalic), true, false, svgFontData));
-            }
+            if (m_svgFontFaceElement)
+                fontData.set(new SimpleFontData(adoptPtr(new SVGFontData(m_svgFontFaceElement)), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic));
 #endif
         }

trunk/WebCore/platform/graphics/SimpleFontData.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2005, 2008 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2005, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov
  *
@@ -48 +48 @@
 namespace WebCore {
 
-SimpleFontData::SimpleFontData(const FontPlatformData& f, bool customFont, bool loading, SVGFontData* svgFontData)
+SimpleFontData::SimpleFontData(const FontPlatformData& platformData, bool isCustomFont, bool isLoading)
     : m_maxCharWidth(-1)
     , m_avgCharWidth(-1)
     , m_unitsPerEm(defaultUnitsPerEm)
-    , m_platformData(f)
+    , m_platformData(platformData)
     , m_treatAsFixedPitch(false)
-#if ENABLE(SVG_FONTS)
-    , m_svgFontData(svgFontData)
-#endif
-    , m_isCustomFont(customFont)
-    , m_isLoading(loading)
+    , m_isCustomFont(isCustomFont)
+    , m_isLoading(isLoading)
     , m_smallCapsFontData(0)
 {
-#if !ENABLE(SVG_FONTS)
-    UNUSED_PARAM(svgFontData);
-#else
-    if (SVGFontFaceElement* svgFontFaceElement = svgFontData ? svgFontData->svgFontFaceElement() : 0) {
-        m_unitsPerEm = svgFontFaceElement->unitsPerEm();
-
-        double scale = f.size();
-        if (m_unitsPerEm)
-            scale /= m_unitsPerEm;
-
-        m_ascent = static_cast<int>(svgFontFaceElement->ascent() * scale);
-        m_descent = static_cast<int>(svgFontFaceElement->descent() * scale);
-        m_xHeight = static_cast<int>(svgFontFaceElement->xHeight() * scale);
-        m_lineGap = 0.1f * f.size();
-        m_lineSpacing = m_ascent + m_descent + m_lineGap;
-
-        SVGFontElement* associatedFontElement = svgFontFaceElement->associatedFontElement();
-
-        Vector<SVGGlyphIdentifier> spaceGlyphs;
-        associatedFontElement->getGlyphIdentifiersForString(String(" ", 1), spaceGlyphs);
-        m_spaceWidth = spaceGlyphs.isEmpty() ? m_xHeight : static_cast<float>(spaceGlyphs.first().horizontalAdvanceX * scale);
-
-        Vector<SVGGlyphIdentifier> numeralZeroGlyphs;
-        associatedFontElement->getGlyphIdentifiersForString(String("0", 1), numeralZeroGlyphs);
-        m_avgCharWidth = numeralZeroGlyphs.isEmpty() ? m_spaceWidth : static_cast<float>(numeralZeroGlyphs.first().horizontalAdvanceX * scale);
-
-        Vector<SVGGlyphIdentifier> letterWGlyphs;
-        associatedFontElement->getGlyphIdentifiersForString(String("W", 1), letterWGlyphs);
-        m_maxCharWidth = letterWGlyphs.isEmpty() ? m_ascent : static_cast<float>(letterWGlyphs.first().horizontalAdvanceX * scale);
-
-        // FIXME: is there a way we can get the space glyph from the SVGGlyphIdentifier above?
-        m_spaceGlyph = 0;
-        m_zeroWidthSpaceGlyph = 0;
-        determinePitch();
-        m_adjustedSpaceWidth = roundf(m_spaceWidth);
-        m_missingGlyphData.fontData = this;
-        m_missingGlyphData.glyph = 0;
-        return;
-    }
-#endif
-
     platformInit();
     platformGlyphInit();
     platformCharWidthInit();
 }
+
+#if ENABLE(SVG_FONTS)
+SimpleFontData::SimpleFontData(PassOwnPtr<SVGFontData> svgFontData, int size, bool syntheticBold, bool syntheticItalic)
+    : m_platformData(FontPlatformData(size, syntheticBold, syntheticItalic))
+    , m_treatAsFixedPitch(false)
+    , m_svgFontData(svgFontData)
+    , m_isCustomFont(true)
+    , m_isLoading(false)
+    , m_smallCapsFontData(0)
+{
+    SVGFontFaceElement* svgFontFaceElement = m_svgFontData->svgFontFaceElement();
+    m_unitsPerEm = svgFontFaceElement->unitsPerEm();
+
+    double scale = size;
+    if (m_unitsPerEm)
+        scale /= m_unitsPerEm;
+
+    m_ascent = static_cast<int>(svgFontFaceElement->ascent() * scale);
+    m_descent = static_cast<int>(svgFontFaceElement->descent() * scale);
+    m_xHeight = static_cast<int>(svgFontFaceElement->xHeight() * scale);
+    m_lineGap = 0.1f * size;
+    m_lineSpacing = m_ascent + m_descent + m_lineGap;
+
+    SVGFontElement* associatedFontElement = svgFontFaceElement->associatedFontElement();
+
+    Vector<SVGGlyphIdentifier> spaceGlyphs;
+    associatedFontElement->getGlyphIdentifiersForString(String(" ", 1), spaceGlyphs);
+    m_spaceWidth = spaceGlyphs.isEmpty() ? m_xHeight : static_cast<float>(spaceGlyphs.first().horizontalAdvanceX * scale);
+
+    Vector<SVGGlyphIdentifier> numeralZeroGlyphs;
+    associatedFontElement->getGlyphIdentifiersForString(String("0", 1), numeralZeroGlyphs);
+    m_avgCharWidth = numeralZeroGlyphs.isEmpty() ? m_spaceWidth : static_cast<float>(numeralZeroGlyphs.first().horizontalAdvanceX * scale);
+
+    Vector<SVGGlyphIdentifier> letterWGlyphs;
+    associatedFontElement->getGlyphIdentifiersForString(String("W", 1), letterWGlyphs);
+    m_maxCharWidth = letterWGlyphs.isEmpty() ? m_ascent : static_cast<float>(letterWGlyphs.first().horizontalAdvanceX * scale);
+
+    // FIXME: is there a way we can get the space glyph from the SVGGlyphIdentifier above?
+    m_spaceGlyph = 0;
+    m_zeroWidthSpaceGlyph = 0;
+    determinePitch();
+    m_adjustedSpaceWidth = roundf(m_spaceWidth);
+    m_missingGlyphData.fontData = this;
+    m_missingGlyphData.glyph = 0;
+}
+#endif
 
 #if !PLATFORM(QT)

trunk/WebCore/platform/graphics/SimpleFontData.h

@@ -2 +2 @@
  * This file is part of the internal font implementation.
  *
- * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
@@ -33 +33 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
+#include <wtf/RetainPtr.h>
 
 #if USE(ATSUI)
 typedef struct OpaqueATSUStyle* ATSUStyle;
-#endif
-
-#if USE(CORE_TEXT)
-#include <ApplicationServices/ApplicationServices.h>
-#include <wtf/RetainPtr.h>
 #endif
 
@@ -63 +59 @@
 
 class FontDescription;
-class FontPlatformData;
 class SharedBuffer;
 class SVGFontData;
@@ -71 +66 @@
 class SimpleFontData : public FontData {
 public:
-    SimpleFontData(const FontPlatformData&, bool customFont = false, bool loading = false, SVGFontData* data = 0);
+    SimpleFontData(const FontPlatformData&, bool isCustomFont = false, bool isLoading = false);
+#if ENABLE(SVG_FONTS)
+    SimpleFontData(PassOwnPtr<SVGFontData>, int size, bool syntheticBold, bool syntheticItalic);
+#endif
     virtual ~SimpleFontData();
 
-public:
     const FontPlatformData& platformData() const { return m_platformData; }
     SimpleFontData* smallCapsFontData(const FontDescription& fontDescription) const;
@@ -132 +129 @@
 
 #if USE(CORE_TEXT)
-    CTFontRef getCTFont() const;
     CFDictionaryRef getCFStringAttributes(TypesettingFeatures) const;
 #endif
@@ -237 +233 @@
 
 #if USE(CORE_TEXT)
-    mutable RetainPtr<CTFontRef> m_CTFont;
     mutable HashMap<unsigned, RetainPtr<CFDictionaryRef> > m_CFStringAttributes;
 #endif

trunk/WebCore/platform/graphics/mac/FontPlatformData.h

@@ -3 +3 @@
  * It should not be included by source files outside of it.
  *
- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -115 +115 @@
     void setFont(NSFont *font);
 
+#if USE(CORE_TEXT)
+    CTFontRef ctFont() const;
+#endif
+
     bool roundsGlyphAdvances() const;
     bool allowsLigatures() const;
@@ -133 +137 @@
 
     NSFont *m_font;
+
 #ifndef BUILDING_ON_TIGER
     RetainPtr<CGFontRef> m_cgFont;
 #else
     CGFontRef m_cgFont; // It is not necessary to refcount this, since either an NSFont owns it or some CachedFont has it referenced.
+#endif
+
+#if USE(CORE_TEXT)
+    mutable RetainPtr<CTFontRef> m_CTFont;
 #endif
 

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

@@ -62 +62 @@
     m_atsuFontID = f.m_atsuFontID;
     m_isColorBitmapFont = f.m_isColorBitmapFont;
+#if USE(CORE_TEXT)
+    m_CTFont = f.m_CTFont;
+#endif
 }
 
@@ -85 +88 @@
     m_font = f.m_font;
     m_isColorBitmapFont = f.m_isColorBitmapFont;
+#if USE(CORE_TEXT)
+    m_CTFont = f.m_CTFont;
+#endif
     return *this;
 }
@@ -108 +114 @@
     m_isColorBitmapFont = CTFontGetSymbolicTraits(toCTFontRef(font)) & kCTFontColorGlyphsTrait;
 #endif
+#if USE(CORE_TEXT)
+    m_CTFont = 0;
+#endif
 }
 
@@ -120 +129 @@
 }
 
+#if USE(CORE_TEXT)
+CTFontRef FontPlatformData::ctFont() const
+{
+    if (m_font)
+        return toCTFontRef(m_font);
+    if (!m_CTFont)
+        m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, 0));
+    return m_CTFont.get();
+}
+#endif // USE(CORE_TEXT)
+
 #ifndef NDEBUG
 String FontPlatformData::description() const

trunk/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp

@@ -42 +42 @@
 namespace WebCore {
 
-CTFontRef SimpleFontData::getCTFont() const
-{
-    if (getNSFont())
-        return toCTFontRef(getNSFont());
-    if (!m_CTFont)
-        m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_platformData.cgFont(), m_platformData.size(), 0, 0));
-    return m_CTFont.get();
-}
-
 CFDictionaryRef SimpleFontData::getCFStringAttributes(TypesettingFeatures typesettingFeatures) const
 {
@@ -71 +62 @@
         static CFNumberRef kerningAdjustment = CFNumberCreate(kCFAllocatorDefault, kCFNumberFloatType, &kerningAdjustmentValue);
         static const void* keysWithKerningDisabled[] = { kCTFontAttributeName, kCTKernAttributeName, kCTLigatureAttributeName };
-        const void* valuesWithKerningDisabled[] = { getCTFont(), kerningAdjustment, allowLigatures
+        const void* valuesWithKerningDisabled[] = { platformData().ctFont(), kerningAdjustment, allowLigatures
             ? ligaturesAllowed : ligaturesNotAllowed };
         attributesDictionary.adoptCF(CFDictionaryCreate(0, keysWithKerningDisabled, valuesWithKerningDisabled,
@@ -79 +70 @@
         // By omitting the kCTKernAttributeName attribute, we get Core Text's standard kerning.
         static const void* keysWithKerningEnabled[] = { kCTFontAttributeName, kCTLigatureAttributeName };
-        const void* valuesWithKerningEnabled[] = { getCTFont(), allowLigatures ? ligaturesAllowed : ligaturesNotAllowed };
+        const void* valuesWithKerningEnabled[] = { platformData().ctFont(), allowLigatures ? ligaturesAllowed : ligaturesNotAllowed };
         attributesDictionary.adoptCF(CFDictionaryCreate(0, keysWithKerningEnabled, valuesWithKerningEnabled,
             sizeof(keysWithKerningEnabled) / sizeof(*keysWithKerningEnabled),

trunk/WebCore/svg/SVGFontData.cpp

@@ -34 +34 @@
     , m_verticalAdvanceY(fontFaceElement->verticalAdvanceY())
 {
+    ASSERT_ARG(fontFaceElement, fontFaceElement);
 }