Simplify text emphasis painting

Source/platform/fonts/shaping/SimpleShaper.cpp

 /*
  * Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Holger Hans Peter Freyther
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 19 matching lines @@
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/text/SurrogatePairAwareTextIterator.h"
 #include "wtf/MathExtras.h"
 #include "wtf/unicode/CharacterNames.h"
 
 using namespace WTF;
 using namespace Unicode;
 
 namespace blink {
 
-SimpleShaper::SimpleShaper(const Font* font, const TextRun& run,
-    HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* bounds, bool forTextEmphasis)
-    : Shaper(font, run, forTextEmphasis ? ForTextEmphasis : NotForTextEmphasis, fallbackFonts, bounds)
+SimpleShaper::SimpleShaper(const Font* font, const TextRun& run, const GlyphData* emphasisData,
+    HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* bounds)
+    : Shaper(font, run, emphasisData, fallbackFonts, bounds)
     , m_currentCharacter(0)
     , m_runWidthSoFar(0)
 {
     // If the padding is non-zero, count the number of spaces in the run
     // and divide that by the padding for per space addition.
     m_expansion = m_run.expansion();
     if (!m_expansion) {
         m_expansionPerOpportunity = 0;
     } else {
         bool isAfterExpansion = m_isAfterExpansion;
@@ skipping 113 matching lines @@
         if (hasExtraSpacing && !spaceUsedAsZeroWidthSpace)
             width = adjustSpacing(width, charData);
 
         if (m_glyphBoundingBox) {
             ASSERT(glyphData.fontData);
             glyphBounds = glyphData.fontData->boundsForGlyph(glyphData.glyph);
             glyphBounds.move(glyphOrigin.x(), glyphOrigin.y());
             m_glyphBoundingBox->unite(glyphBounds);
         }
 
-        if (m_forTextEmphasis) {
-            if (!Character::canReceiveTextEmphasis(charData.character))
-                glyph = 0;
-
-            // The emphasis code expects mid-glyph offsets.
-            width /= 2;
-            m_runWidthSoFar += width;
+        if (glyphBuffer) {
+            if (!forTextEmphasis()) {
+                glyphBuffer->add(glyph, fontData, m_runWidthSoFar);
+            } else {

[jbroman, 2015/03/07 18:50:25]

nit: consider

} else if (...) {

to avoid the extra indentation?

[f(malita), 2015/03/09 15:04:55]

Done.

+                if (Character::canReceiveTextEmphasis(charData.character))
+                    addEmphasisMark(glyphBuffer, m_runWidthSoFar + width / 2);
+            }
         }
 
-        if (glyphBuffer)
-            glyphBuffer->add(glyph, fontData, m_runWidthSoFar);
-
         // Advance past the character we just dealt with.
         textIterator.advance(charData.clusterLength);
         m_runWidthSoFar += width;
         // We are handling simple text run here, so Y-Offset will be zero.
         glyphOrigin += FloatSize(width, 0);
     }
 
     unsigned consumedCharacters = textIterator.currentCharacter() - m_currentCharacter;
     m_currentCharacter = textIterator.currentCharacter();
 
@@ skipping 24 matching lines @@
     float initialWidth = m_runWidthSoFar;
 
     if (!advance(m_currentCharacter + 1))
         return false;
 
     width = m_runWidthSoFar - initialWidth;
     return true;
 }
 
 } // namespace blink