Simplify text emphasis painting

Source/platform/fonts/shaping/Shaper.cpp

 /*
  * 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/fonts/shaping/Shaper.h"
 
+#include "platform/fonts/GlyphBuffer.h"
+#include "platform/fonts/GlyphPage.h"
 #include "platform/text/TextRun.h"
 
 namespace blink {
 
-Shaper::Shaper(const Font* font, const TextRun& run, ForTextEmphasisOrNot forTextEmphasis,
+Shaper::Shaper(const Font* font, const TextRun& run, const GlyphData* emphasisData,
     HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* bounds)
     : m_font(font)
     , m_run(run)
     , m_fallbackFonts(fallbackFonts)
     , m_glyphBoundingBox(bounds)
     , m_expansion(0)
     , m_expansionPerOpportunity(0)
     , m_isAfterExpansion(!run.allowsLeadingExpansion())
-    , m_forTextEmphasis(forTextEmphasis)
+    , m_emphasisSubstitutionData(emphasisData)
 {
+    if (emphasisData) {
+        ASSERT(emphasisData->fontData);
+        m_emphasisGlyphCenter = emphasisData->fontData->boundsForGlyph(emphasisData->glyph).center();
+    }
+}
+
+void Shaper::addEmphasisMark(GlyphBuffer* buffer, float midGlyphOffset) const
+{
+    ASSERT(buffer);
+    ASSERT(m_emphasisSubstitutionData);
+
+    const SimpleFontData* emphasisFontData = m_emphasisSubstitutionData->fontData;
+    ASSERT(emphasisFontData);
+
+    bool isVertical = emphasisFontData->platformData().orientation() == Vertical
+        && emphasisFontData->verticalData();
+
+    if (!isVertical) {
+        buffer->add(m_emphasisSubstitutionData->glyph, emphasisFontData,
+            midGlyphOffset - m_emphasisGlyphCenter.x());
+    } else {
+        buffer->add(m_emphasisSubstitutionData->glyph, emphasisFontData,
+            FloatPoint(-m_emphasisGlyphCenter.x(), midGlyphOffset - m_emphasisGlyphCenter.y()));
+    }
 }
 
 } // namespace blink