| Index: Source/platform/fonts/Font.h
|
| diff --git a/Source/platform/fonts/Font.h b/Source/platform/fonts/Font.h
|
| index 33c1612c9500feadb4ba0fbc84b0090464d7ea23..15a8c1e634c8bd4e6fa07ceed050c75a807dac12 100644
|
| --- a/Source/platform/fonts/Font.h
|
| +++ b/Source/platform/fonts/Font.h
|
| @@ -137,13 +137,12 @@ public:
|
| private:
|
| enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis };
|
|
|
| - // Returns the initial in-stream advance.
|
| + // Returns the total advance.
|
| float buildGlyphBuffer(const TextRunPaintInfo&, GlyphBuffer&, ForTextEmphasisOrNot = NotForTextEmphasis) const;
|
| - PassTextBlobPtr buildTextBlob(const GlyphBuffer&, float initialAdvance, const FloatRect& bounds,
|
| - bool couldUseLCD) const;
|
| + PassTextBlobPtr buildTextBlob(const GlyphBuffer&, const FloatRect& bounds, bool couldUseLCD) const;
|
| void drawGlyphs(GraphicsContext*, const SimpleFontData*, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&, const FloatRect& textRect) const;
|
| void drawTextBlob(GraphicsContext*, const SkTextBlob*, const SkPoint& origin) const;
|
| - float drawGlyphBuffer(GraphicsContext*, const TextRunPaintInfo&, const GlyphBuffer&, const FloatPoint&) const;
|
| + void drawGlyphBuffer(GraphicsContext*, const TextRunPaintInfo&, const GlyphBuffer&, const FloatPoint&) 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;
|
|
|