Revert 165189 "Rendering text-justify:distribute for 8 bit chara..."

trunk/Source/platform/fonts/Font.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2010, 2011 Apple 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 508 matching lines @@
         0x1F110, 0x1F129,
         0x1F130, 0x1F149,
         0x1F150, 0x1F169,
         0x1F170, 0x1F189,
         0x1F200, 0x1F6FF
     };
 
     return valueInIntervalList(cjkSymbolRanges, c);
 }
 
-unsigned Font::expansionOpportunityCount(const LChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion, bool distributeJustification)
+unsigned Font::expansionOpportunityCount(const LChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion)
 {
     unsigned count = 0;
     if (direction == LTR) {
         for (size_t i = 0; i < length; ++i) {
-            if (treatAsSpace(characters[i]) || distributeJustification)
+            if (treatAsSpace(characters[i])) {
                 count++;
+                isAfterExpansion = true;
+            } else
+                isAfterExpansion = false;
         }
-        if (treatAsSpace(characters[length - 1]))
-            isAfterExpansion = true;
-        else
-            isAfterExpansion = false;
     } else {
         for (size_t i = length; i > 0; --i) {
-            if (treatAsSpace(characters[i - 1]) || distributeJustification)
+            if (treatAsSpace(characters[i - 1])) {
                 count++;
+                isAfterExpansion = true;
+            } else
+                isAfterExpansion = false;
         }
-        if (treatAsSpace(characters[0]))
-            isAfterExpansion = true;
-        else
-            isAfterExpansion = false;
     }
     return count;
 }
 
-// FIXME: need to take care of text-justify:distribute case
-unsigned Font::expansionOpportunityCount(const UChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion, bool distributeJustification)
+unsigned Font::expansionOpportunityCount(const UChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion)
 {
     static bool expandAroundIdeographs = canExpandAroundIdeographsInComplexText();
     unsigned count = 0;
     if (direction == LTR) {
         for (size_t i = 0; i < length; ++i) {
             UChar32 character = characters[i];
             if (treatAsSpace(character)) {
                 count++;
                 isAfterExpansion = true;
                 continue;
@@ skipping 51 matching lines @@
 }
 
 void Font::willUseFontData() const
 {
     const FontFamily& family = fontDescription().family();
     if (m_fontFallbackList && m_fontFallbackList->fontSelector() && !family.familyIsEmpty())
         m_fontFallbackList->fontSelector()->willUseFontData(fontDescription(), family.family());
 }
 
 }