| Index: Source/platform/fonts/Font.h
|
| diff --git a/Source/platform/fonts/Font.h b/Source/platform/fonts/Font.h
|
| index 7547ef5139b295a0efddfcdc1dd5bdf273c1a083..7a897259c7cc04613dcd687968c3229027317797 100644
|
| --- a/Source/platform/fonts/Font.h
|
| +++ b/Source/platform/fonts/Font.h
|
| @@ -135,6 +135,9 @@ public:
|
|
|
| CodePath codePath(const TextRun&) const;
|
|
|
| + PassTextBlobPtr buildTextBlob(const TextRunPaintInfo&, const FloatPoint& textOrigin, bool couldUseLCDRenderedText, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const;
|
| + void drawTextBlob(GraphicsContext*, const SkTextBlob*, const SkPoint& origin) const;
|
| +
|
| private:
|
| enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis };
|
|
|
| @@ -144,7 +147,6 @@ private:
|
| void drawEmphasisMarksForSimpleText(GraphicsContext*, const TextRunPaintInfo&, const AtomicString& mark, const FloatPoint&) const;
|
| void drawGlyphs(GraphicsContext*, const SimpleFontData*, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&, const FloatRect& textRect) const;
|
| float drawGlyphBuffer(GraphicsContext*, const TextRunPaintInfo&, const GlyphBuffer&, const FloatPoint&) const;
|
| - void drawTextBlob(GraphicsContext*, const SkTextBlob*, const SkPoint& origin) const;
|
| void drawEmphasisMarks(GraphicsContext*, const TextRunPaintInfo&, const GlyphBuffer&, const AtomicString&, const FloatPoint&) const;
|
| float floatWidthForSimpleText(const TextRun&, HashSet<const SimpleFontData*>* fallbackFonts = 0, IntRectExtent* glyphBounds = 0) const;
|
| int offsetForPositionForSimpleText(const TextRun&, float position, bool includePartialGlyphs) const;
|
| @@ -160,6 +162,9 @@ private:
|
| int offsetForPositionForComplexText(const TextRun&, float position, bool includePartialGlyphs) const;
|
| FloatRect selectionRectForComplexText(const TextRun&, const FloatPoint&, int h, int from, int to) const;
|
|
|
| + PassTextBlobPtr buildTextBlobForSimpleText(const TextRunPaintInfo&, const FloatPoint& textOrigin, bool couldUseLCDRenderedText) const;
|
| + PassTextBlobPtr buildTextBlob(const GlyphBuffer&, float initialAdvance, const FloatRect& bounds, float& advance, bool couldUseLCD) const;
|
| +
|
| friend struct WidthIterator;
|
| friend class SVGTextRunRenderingContext;
|
|
|
| @@ -187,9 +192,6 @@ private:
|
| return m_fontFallbackList && m_fontFallbackList->shouldSkipDrawing();
|
| }
|
|
|
| - PassTextBlobPtr buildTextBlob(const GlyphBuffer&, float initialAdvance, const FloatRect& bounds,
|
| - float& advance, bool couldUseLCD) const;
|
| -
|
| FontDescription m_fontDescription;
|
| mutable RefPtr<FontFallbackList> m_fontFallbackList;
|
| };
|
|
|