Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Unified Diff: Source/platform/fonts/shaping/HarfBuzzShaper.h

Issue 1239603002: Revert of Change fallback font collection in HarfBuzzShaper (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/fonts/shaping/HarfBuzzShaper.h
diff --git a/Source/platform/fonts/shaping/HarfBuzzShaper.h b/Source/platform/fonts/shaping/HarfBuzzShaper.h
index 89b451b2859583dcfd96d1a2e31e7c94a1123350..466d9da47c172225ea70ec3cc4ba567edaedbe55 100644
--- a/Source/platform/fonts/shaping/HarfBuzzShaper.h
+++ b/Source/platform/fonts/shaping/HarfBuzzShaper.h
@@ -60,7 +60,10 @@
FloatRect bounds() { return m_glyphBoundingBox; }
int offsetForPosition(float targetX);
unsigned numCharacters() const { return m_numCharacters; }
- void fallbackFonts(HashSet<const SimpleFontData*>*) const;
+ const HashSet<const SimpleFontData*>* fallbackFonts() const
+ {
+ return &m_fallbackFonts;
+ }
static float fillGlyphBuffer(Vector<RefPtr<ShapeResult>>&,
GlyphBuffer*, const TextRun&, unsigned from, unsigned to);
@@ -91,7 +94,7 @@
float m_width;
FloatRect m_glyphBoundingBox;
Vector<RunInfo*> m_runs;
- const SimpleFontData* m_primaryFont;
+ HashSet<const SimpleFontData*> m_fallbackFonts;
unsigned m_numCharacters;
unsigned m_numGlyphs : 31;
@@ -106,7 +109,8 @@
class PLATFORM_EXPORT HarfBuzzShaper final : public Shaper {
public:
- HarfBuzzShaper(const Font*, const TextRun&);
+ HarfBuzzShaper(const Font*, const TextRun&,
+ HashSet<const SimpleFontData*>* fallbackFonts);
PassRefPtr<ShapeResult> shapeResult();
~HarfBuzzShaper() { }
« no previous file with comments | « Source/platform/fonts/shaping/CachingWordShaperTest.cpp ('k') | Source/platform/fonts/shaping/HarfBuzzShaper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698