Chromium Code Reviews| Index: Source/platform/fonts/shaping/HarfBuzzShaper.h |
| diff --git a/Source/platform/fonts/shaping/HarfBuzzShaper.h b/Source/platform/fonts/shaping/HarfBuzzShaper.h |
| index 466d9da47c172225ea70ec3cc4ba567edaedbe55..0ab795dc9f175c3da95243dbe988c5140158587d 100644 |
| --- a/Source/platform/fonts/shaping/HarfBuzzShaper.h |
| +++ b/Source/platform/fonts/shaping/HarfBuzzShaper.h |
| @@ -60,10 +60,7 @@ public: |
| FloatRect bounds() { return m_glyphBoundingBox; } |
| int offsetForPosition(float targetX); |
| unsigned numCharacters() const { return m_numCharacters; } |
| - const HashSet<const SimpleFontData*>* fallbackFonts() const |
| - { |
| - return &m_fallbackFonts; |
| - } |
| + void fallbackFonts(HashSet<const SimpleFontData*>*) const; |
| static float fillGlyphBuffer(Vector<RefPtr<ShapeResult>>&, |
| GlyphBuffer*, const TextRun&, unsigned from, unsigned to); |
| @@ -74,6 +71,7 @@ public: |
| TextDirection, float totalWidth, const FloatPoint&, int height, |
| unsigned from, unsigned to); |
| + |
|
leviw_travelin_and_unemployed
2015/07/13 20:47:24
Nit: extra newlines are the devil.
|
| unsigned numberOfRunsForTesting() const; |
| bool runInfoForTesting(unsigned runIndex, unsigned& startIndex, |
| unsigned& numGlyphs, hb_script_t&); |
| @@ -94,7 +92,7 @@ private: |
| float m_width; |
| FloatRect m_glyphBoundingBox; |
| Vector<RunInfo*> m_runs; |
| - HashSet<const SimpleFontData*> m_fallbackFonts; |
| + const SimpleFontData* m_primaryFont; |
| unsigned m_numCharacters; |
| unsigned m_numGlyphs : 31; |
| @@ -109,8 +107,7 @@ private: |
| class PLATFORM_EXPORT HarfBuzzShaper final : public Shaper { |
| public: |
| - HarfBuzzShaper(const Font*, const TextRun&, |
| - HashSet<const SimpleFontData*>* fallbackFonts); |
| + HarfBuzzShaper(const Font*, const TextRun&); |
| PassRefPtr<ShapeResult> shapeResult(); |
| ~HarfBuzzShaper() { } |