Remove obsolete canExpandAroundIdeographsInComplexText

Source/platform/fonts/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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "platform/fonts/SimpleShaper.h"
 
 #include "platform/fonts/Character.h"
 #include "platform/fonts/Font.h"
-#include "platform/fonts/FontPlatformFeatures.h"
 #include "platform/fonts/GlyphBuffer.h"
 #include "platform/fonts/Latin1TextIterator.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/text/SurrogatePairAwareTextIterator.h"
 #include "wtf/MathExtras.h"
 
 using namespace WTF;
 using namespace Unicode;
 
 namespace blink {
@@ skipping 68 matching lines @@
     m_fallbackFonts->add(fontData);
 }
 
 float SimpleShaper::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))) {
+    if (treatAsSpace) {
         // Distribute the run's total expansion evenly over all expansion opportunities in the run.
         if (m_expansion) {
             if (!treatAsSpace && !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)
@@ skipping 126 matching lines @@
     float initialWidth = m_runWidthSoFar;
 
     if (!advance(m_currentCharacter + 1))
         return false;
 
     width = m_runWidthSoFar - initialWidth;
     return true;
 }
 
 } // namespace blink