Simplify text emphasis painting

Source/platform/fonts/shaping/Shaper.h

 /*
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "platform/fonts/Font.h"
 #include "wtf/HashSet.h"
 
 namespace blink {
 
 class FloatRect;
 class GlyphBuffer;
 class SimpleFontData;
 class TextRun;
 
+struct GlyphData;
+
 class PLATFORM_EXPORT Shaper {
-public:
-    enum ForTextEmphasisOrNot {
-        NotForTextEmphasis,
-        ForTextEmphasis
-    };
-
 protected:
-    Shaper(const Font*, const TextRun&, ForTextEmphasisOrNot = NotForTextEmphasis, HashSet<const SimpleFontData*>* fallbackFonts = nullptr, FloatRect* = nullptr);
+    Shaper(const Font*, const TextRun&, const GlyphData* emphasisData = nullptr,
+        HashSet<const SimpleFontData*>* fallbackFonts = nullptr, FloatRect* = nullptr);
 
     void trackNonPrimaryFallbackFont(const SimpleFontData*);
 
-protected:
+    bool forTextEmphasis() const { return m_emphasisSubstitutionData; }
+    void addEmphasisMark(GlyphBuffer*, float midGlyphOffset) const;
+
     const Font* m_font;
     const TextRun& m_run;
     HashSet<const SimpleFontData*>* m_fallbackFonts;
     FloatRect* m_glyphBoundingBox;
 
     float m_expansion; // Pixels to be distributed over the line at word breaks.
     float m_expansionPerOpportunity; // Pixels to be added to each expansion opportunity.
     bool m_isAfterExpansion;
 
-    ForTextEmphasisOrNot m_forTextEmphasis;
+private:
+    // Emphasis substitution info. If specified, this will be used to replace all glyphs which
+    // can receive text emphasis with center-aligned emphasis glyphs.
+    const GlyphData* m_emphasisSubstitutionData;
+    FloatPoint m_emphasisGlyphCenter;
 };
 
 inline void Shaper::trackNonPrimaryFallbackFont(const SimpleFontData* fontData)
 {
     ASSERT(m_fallbackFonts);
 
     if (fontData == m_font->primaryFont())
         return;
 
     m_fallbackFonts->add(fontData);
 }
 
 } // namespace blink
 
 #endif // Shaper_h