| Index: Source/core/platform/graphics/FontDescription.h
|
| diff --git a/Source/core/platform/graphics/FontDescription.h b/Source/core/platform/graphics/FontDescription.h
|
| index 304d1829c46847ea3c39e22d93ed159b582cdb4a..227c5b1a6f9a0ab6312370d933353b2a4a7954f9 100644
|
| --- a/Source/core/platform/graphics/FontDescription.h
|
| +++ b/Source/core/platform/graphics/FontDescription.h
|
| @@ -25,7 +25,6 @@
|
| #ifndef FontDescription_h
|
| #define FontDescription_h
|
|
|
| -#include "FontFamilyNames.h"
|
| #include "core/platform/graphics/FontFamily.h"
|
| #include "core/platform/graphics/FontFeatureSettings.h"
|
| #include "core/platform/graphics/FontOrientation.h"
|
| @@ -41,8 +40,6 @@
|
|
|
| namespace WebCore {
|
|
|
| -using namespace FontFamilyNames;
|
| -
|
| enum FontWeight {
|
| FontWeight100,
|
| FontWeight200,
|
| @@ -117,8 +114,7 @@ public:
|
| FontWeight bolderWeight() const;
|
| GenericFamilyType genericFamily() const { return static_cast<GenericFamilyType>(m_genericFamily); }
|
| bool usePrinterFont() const { return m_usePrinterFont; }
|
| - // only use fixed default size when there is only one font family, and that family is "monospace"
|
| - bool useFixedDefaultSize() const { return genericFamily() == MonospaceFamily && !family().next() && family().family() == monospaceFamily; }
|
| + bool useFixedDefaultSize() const;
|
| FontRenderingMode renderingMode() const { return static_cast<FontRenderingMode>(m_renderingMode); }
|
| Kerning kerning() const { return static_cast<Kerning>(m_kerning); }
|
| LigaturesState commonLigaturesState() const { return static_cast<LigaturesState>(m_commonLigaturesState); }
|
|
|