| Index: Source/core/platform/graphics/Font.h
|
| diff --git a/Source/core/platform/graphics/Font.h b/Source/core/platform/graphics/Font.h
|
| index 5a3538f78bd6d469b8b0a0eb2c7c8e7d7d27e334..eef57889ae41b1226add8ba6b1c16da9b48f7eaa 100644
|
| --- a/Source/core/platform/graphics/Font.h
|
| +++ b/Source/core/platform/graphics/Font.h
|
| @@ -51,7 +51,6 @@ class FontPlatformData;
|
| class FontSelector;
|
| class GlyphBuffer;
|
| class GraphicsContext;
|
| -class RenderText;
|
| class TextLayout;
|
| class TextRun;
|
| struct TextRunPaintInfo;
|
| @@ -104,7 +103,7 @@ public:
|
| float width(const TextRun&, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
|
| float width(const TextRun&, int& charsConsumed, String& glyphName) const;
|
|
|
| - PassOwnPtr<TextLayout> createLayout(RenderText*, float xPos, bool collapseWhiteSpace) const;
|
| + PassOwnPtr<TextLayout> createLayoutForMacComplexText(const TextRun&, unsigned textLength, float xPos, bool collapseWhiteSpace) const;
|
| static void deleteLayout(TextLayout*);
|
| static float width(TextLayout&, unsigned from, unsigned len, HashSet<const SimpleFontData*>* fallbackFonts = 0);
|
|
|
|
|