Rendering text-justify:distribute for 8 bit characters.

Source/platform/fonts/WidthIterator.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 41 matching lines @@
     , m_accountForGlyphBounds(accountForGlyphBounds)
     , m_forTextEmphasis(forTextEmphasis)
 {
     // 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;
-        unsigned expansionOpportunityCount = m_run.is8Bit() ? Character::expansionOpportunityCount(m_run.characters8(), m_run.length(), m_run.direction(), isAfterExpansion) : Character::expansionOpportunityCount(m_run.characters16(), m_run.length(), m_run.direction(), isAfterExpansion);
+        unsigned expansionOpportunityCount = m_run.is8Bit() ? Character::expansionOpportunityCount(m_run.characters8(), m_run.length(), m_run.direction(), isAfterExpansion, m_run.textJustify()) : Character::expansionOpportunityCount(m_run.characters16(), m_run.length(), m_run.direction(), isAfterExpansion, m_run.textJustify());
         if (isAfterExpansion && !m_run.allowsTrailingExpansion())
             expansionOpportunityCount--;
 
         if (!expansionOpportunityCount)
             m_expansionPerOpportunity = 0;
         else
             m_expansionPerOpportunity = m_expansion / expansionOpportunityCount;
     }
 }
 
@@ skipping 48 matching lines @@
 }
 
 float WidthIterator::adjustSpacing(float width, const CharacterData& charData,
     const SimpleFontData& fontData, GlyphBuffer* glyphBuffer)
 {
     // Account for letter-spacing.
     if (width)
         width += m_font->fontDescription().letterSpacing();
 
     static bool expandAroundIdeographs = FontPlatformFeatures::canExpandAroundIdeographsInComplexText();
-    bool treatAsSpace = Character::treatAsSpace(charData.character);
-    if (treatAsSpace || (expandAroundIdeographs && Character::isCJKIdeographOrSymbol(charData.character))) {
+    bool isExpansionOpportunity = Character::treatAsSpace(charData.character) || (m_run.textJustify() == JustifyDistribute);
+    if (isExpansionOpportunity || (expandAroundIdeographs && Character::isCJKIdeographOrSymbol(charData.character))) {
+
         // Distribute the run's total expansion evenly over all expansion opportunities in the run.
         if (m_expansion) {
-            if (!treatAsSpace && !m_isAfterExpansion) {
+            if (!isExpansionOpportunity && !m_isAfterExpansion) {
                 // Take the expansion opportunity before this ideograph.
                 m_expansion -= m_expansionPerOpportunity;
                 float expansionAtThisOpportunity = m_expansionPerOpportunity;
                 m_runWidthSoFar += expansionAtThisOpportunity;
                 if (glyphBuffer) {
                     if (glyphBuffer->isEmpty()) {
                         if (m_forTextEmphasis)
                             glyphBuffer->add(fontData.zeroWidthSpaceGlyph(), &fontData, m_expansionPerOpportunity);
                         else
                             glyphBuffer->add(fontData.spaceGlyph(), &fontData, expansionAtThisOpportunity);
                     } else {
                         glyphBuffer->expandLastAdvance(expansionAtThisOpportunity);
                     }
                 }
             }
             if (m_run.allowsTrailingExpansion()
                 || (m_run.ltr() && charData.characterOffset + charData.clusterLength < static_cast<size_t>(m_run.length()))
                 || (m_run.rtl() && charData.characterOffset)) {
                 m_expansion -= m_expansionPerOpportunity;
                 width += m_expansionPerOpportunity;
                 m_isAfterExpansion = true;
             }
         } else {
             m_isAfterExpansion = false;
         }
 
         // Account for word spacing.
         // We apply additional space between "words" by adding width to the space character.
-        if (treatAsSpace && (charData.character != '\t' || !m_run.allowTabs())
+        if (isExpansionOpportunity && (charData.character != '\t' || !m_run.allowTabs())
             && (charData.characterOffset || charData.character == noBreakSpace)
             && m_font->fontDescription().wordSpacing()) {
             width += m_font->fontDescription().wordSpacing();
         }
     } else {
         m_isAfterExpansion = false;
     }
 
     return width;
 }
@@ skipping 83 matching lines @@
     float initialWidth = m_runWidthSoFar;
 
     if (!advance(m_currentCharacter + 1))
         return false;
 
     width = m_runWidthSoFar - initialWidth;
     return true;
 }
 
 }