| Index: Source/platform/fonts/SimpleFontData.h
|
| diff --git a/Source/core/platform/graphics/SimpleFontData.h b/Source/platform/fonts/SimpleFontData.h
|
| similarity index 97%
|
| rename from Source/core/platform/graphics/SimpleFontData.h
|
| rename to Source/platform/fonts/SimpleFontData.h
|
| index c001860f275fc55eed13c2e03866aae0ee288230..178f36723e4abe229a9de0fb95b2cd6dc92aa42f 100644
|
| --- a/Source/core/platform/graphics/SimpleFontData.h
|
| +++ b/Source/platform/fonts/SimpleFontData.h
|
| @@ -24,18 +24,17 @@
|
| #ifndef SimpleFontData_h
|
| #define SimpleFontData_h
|
|
|
| -#include "core/platform/graphics/CustomFontData.h"
|
| -#include "core/platform/graphics/FontPlatformData.h"
|
| -#include "core/platform/graphics/GlyphPageTreeNode.h"
|
| +#include "platform/PlatformExport.h"
|
| +#include "platform/fonts/CustomFontData.h"
|
| #include "platform/fonts/FontBaseline.h"
|
| #include "platform/fonts/FontData.h"
|
| #include "platform/fonts/FontMetrics.h"
|
| +#include "platform/fonts/FontPlatformData.h"
|
| #include "platform/fonts/GlyphBuffer.h"
|
| #include "platform/fonts/GlyphMetricsMap.h"
|
| -#if ENABLE(OPENTYPE_VERTICAL)
|
| -#include "core/platform/graphics/opentype/OpenTypeVerticalData.h"
|
| -#endif
|
| +#include "platform/fonts/GlyphPageTreeNode.h"
|
| #include "platform/fonts/TypesettingFeatures.h"
|
| +#include "platform/fonts/opentype/OpenTypeVerticalData.h"
|
| #include "platform/geometry/FloatRect.h"
|
| #include "wtf/OwnPtr.h"
|
| #include "wtf/PassOwnPtr.h"
|
| @@ -56,7 +55,7 @@ struct WidthIterator;
|
| enum FontDataVariant { AutoVariant, NormalVariant, SmallCapsVariant, EmphasisMarkVariant, BrokenIdeographVariant };
|
| enum Pitch { UnknownPitch, FixedPitch, VariablePitch };
|
|
|
| -class SimpleFontData : public FontData {
|
| +class PLATFORM_EXPORT SimpleFontData : public FontData {
|
| public:
|
| // Used to create platform fonts.
|
| static PassRefPtr<SimpleFontData> create(const FontPlatformData& platformData, PassRefPtr<CustomFontData> customData = 0, bool isTextOrientationFallback = false)
|
|
|