| Index: Source/WebCore/platform/graphics/Font.h
|
| diff --git a/Source/WebCore/platform/graphics/Font.h b/Source/WebCore/platform/graphics/Font.h
|
| index d6d393a1627453c7ddea2423ae8a9fa4bc5847fc..d8b2a2e889466a58ac8725f5fee8133961212737 100644
|
| --- a/Source/WebCore/platform/graphics/Font.h
|
| +++ b/Source/WebCore/platform/graphics/Font.h
|
| @@ -35,13 +35,6 @@
|
| #include <wtf/MathExtras.h>
|
| #include <wtf/unicode/CharacterNames.h>
|
|
|
| -#if PLATFORM(QT)
|
| -#include <QRawFont>
|
| -QT_BEGIN_NAMESPACE
|
| -class QTextLayout;
|
| -QT_END_NAMESPACE
|
| -#endif
|
| -
|
| // "X11/X.h" defines Complex to 0 and conflicts
|
| // with Complex value in CodePath enum.
|
| #ifdef Complex
|
| @@ -167,11 +160,6 @@ public:
|
| static unsigned expansionOpportunityCount(const LChar*, size_t length, TextDirection, bool& isAfterExpansion);
|
| static unsigned expansionOpportunityCount(const UChar*, size_t length, TextDirection, bool& isAfterExpansion);
|
|
|
| -#if PLATFORM(QT)
|
| - QRawFont rawFont() const;
|
| - QFont syntheticFont() const;
|
| -#endif
|
| -
|
| static void setShouldUseSmoothing(bool);
|
| static bool shouldUseSmoothing();
|
|
|
| @@ -296,10 +284,6 @@ private:
|
| return features;
|
| }
|
|
|
| -#if PLATFORM(QT)
|
| - void initFormatForTextLayout(QTextLayout*, const TextRun&) const;
|
| -#endif
|
| -
|
| static TypesettingFeatures s_defaultTypesettingFeatures;
|
|
|
| FontDescription m_fontDescription;
|
|
|