| Index: sky/engine/platform/fonts/SimpleFontData.h
|
| diff --git a/sky/engine/platform/fonts/SimpleFontData.h b/sky/engine/platform/fonts/SimpleFontData.h
|
| index dc373dccaafca3019312e9eec949baa486dde872..2ac4498ad4977d473997a31f7abb8ed138b8e072 100644
|
| --- a/sky/engine/platform/fonts/SimpleFontData.h
|
| +++ b/sky/engine/platform/fonts/SimpleFontData.h
|
| @@ -39,10 +39,6 @@
|
| #include "wtf/PassOwnPtr.h"
|
| #include "wtf/text/StringHash.h"
|
|
|
| -#if OS(MACOSX)
|
| -#include "wtf/RetainPtr.h"
|
| -#endif
|
| -
|
| namespace blink {
|
|
|
| class FontDescription;
|
| @@ -118,10 +114,6 @@ public:
|
| float spaceWidth() const { return m_spaceWidth; }
|
| void setSpaceWidth(float spaceWidth) { m_spaceWidth = spaceWidth; }
|
|
|
| -#if OS(MACOSX)
|
| - float syntheticBoldOffset() const { return m_syntheticBoldOffset; }
|
| -#endif
|
| -
|
| Glyph spaceGlyph() const { return m_spaceGlyph; }
|
| void setSpaceGlyph(Glyph spaceGlyph) { m_spaceGlyph = spaceGlyph; }
|
| Glyph zeroWidthSpaceGlyph() const { return m_zeroWidthSpaceGlyph; }
|
| @@ -151,15 +143,6 @@ public:
|
| virtual String description() const override;
|
| #endif
|
|
|
| -#if OS(MACOSX)
|
| - const SimpleFontData* getCompositeFontReferenceFontData(NSFont *key) const;
|
| - NSFont* getNSFont() const { return m_platformData.font(); }
|
| -#endif
|
| -
|
| -#if OS(MACOSX)
|
| - CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
|
| -#endif
|
| -
|
| bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
|
|
|
| PassRefPtr<CustomFontData> customFontData() const { return m_customFontData; }
|
| @@ -219,9 +202,6 @@ private:
|
| RefPtr<SimpleFontData> brokenIdeograph;
|
| RefPtr<SimpleFontData> verticalRightOrientation;
|
| RefPtr<SimpleFontData> uprightOrientation;
|
| -#if OS(MACOSX)
|
| - mutable RetainPtr<CFMutableDictionaryRef> compositeFontReferences;
|
| -#endif
|
|
|
| private:
|
| DerivedFontData(bool custom)
|
| @@ -234,12 +214,6 @@ private:
|
|
|
| RefPtr<CustomFontData> m_customFontData;
|
|
|
| -#if OS(MACOSX)
|
| - float m_syntheticBoldOffset;
|
| -
|
| - mutable HashMap<unsigned, RetainPtr<CFDictionaryRef> > m_CFStringAttributes;
|
| -#endif
|
| -
|
| mutable OwnPtr<HashMap<String, bool> > m_combiningCharacterSequenceSupport;
|
| };
|
|
|
| @@ -273,11 +247,7 @@ ALWAYS_INLINE float SimpleFontData::widthForGlyph(Glyph glyph) const
|
|
|
| #if ENABLE(OPENTYPE_VERTICAL)
|
| if (m_verticalData)
|
| -#if OS(MACOSX)
|
| - width = m_verticalData->advanceHeight(this, glyph) + m_syntheticBoldOffset;
|
| -#else
|
| width = m_verticalData->advanceHeight(this, glyph);
|
| -#endif
|
| else
|
| #endif
|
| width = platformWidthForGlyph(glyph);
|
|
|