| Index: third_party/WebKit/Source/platform/fonts/shaping/ShapeResultBuffer.h
|
| diff --git a/third_party/WebKit/Source/platform/fonts/shaping/ShapeResultBuffer.h b/third_party/WebKit/Source/platform/fonts/shaping/ShapeResultBuffer.h
|
| index 8a68e5d10f4321124f958dc2e3b9793a394eafeb..5bd74ceed0a3b83d572ca7312fcae8f837feb950 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/shaping/ShapeResultBuffer.h
|
| +++ b/third_party/WebKit/Source/platform/fonts/shaping/ShapeResultBuffer.h
|
| @@ -18,7 +18,6 @@ class FontDescription;
|
| struct GlyphData;
|
| class ShapeResultBloberizer;
|
| class TextRun;
|
| -struct TextRunPaintInfo;
|
|
|
| class PLATFORM_EXPORT ShapeResultBuffer {
|
| WTF_MAKE_NONCOPYABLE(ShapeResultBuffer);
|
| @@ -34,10 +33,6 @@ class PLATFORM_EXPORT ShapeResultBuffer {
|
|
|
| bool HasVerticalOffsets() const { return has_vertical_offsets_; }
|
|
|
| - float FillGlyphs(const TextRunPaintInfo&, ShapeResultBloberizer&) const;
|
| - void FillTextEmphasisGlyphs(const TextRunPaintInfo&,
|
| - const GlyphData& emphasis_data,
|
| - ShapeResultBloberizer&) const;
|
| int OffsetForPosition(const TextRun&,
|
| float target_x,
|
| bool include_partial_glyphs) const;
|
| @@ -64,6 +59,7 @@ class PLATFORM_EXPORT ShapeResultBuffer {
|
| GlyphData EmphasisMarkGlyphData(const FontDescription&) const;
|
|
|
| private:
|
| + friend class ShapeResultBloberizer;
|
| static CharacterRange GetCharacterRangeInternal(
|
| const Vector<RefPtr<const ShapeResult>, 64>&,
|
| TextDirection,
|
| @@ -71,20 +67,6 @@ class PLATFORM_EXPORT ShapeResultBuffer {
|
| unsigned from,
|
| unsigned to);
|
|
|
| - float FillFastHorizontalGlyphs(const TextRun&, ShapeResultBloberizer&) const;
|
| -
|
| - static float FillGlyphsForResult(ShapeResultBloberizer&,
|
| - const ShapeResult&,
|
| - const TextRunPaintInfo&,
|
| - float initial_advance,
|
| - unsigned run_offset);
|
| - static float FillTextEmphasisGlyphsForRun(ShapeResultBloberizer&,
|
| - const ShapeResult::RunInfo*,
|
| - const TextRunPaintInfo&,
|
| - const GlyphData&,
|
| - float initial_advance,
|
| - unsigned run_offset);
|
| -
|
| static void AddRunInfoRanges(const ShapeResult::RunInfo&,
|
| float offset,
|
| Vector<CharacterRange>&);
|
|
|