Removing broken ideograph font variant

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.
  * Copyright (c) 2007, 2008, 2010 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
@@ skipping 405 matching lines @@
         // Fastest loop, for the common case (normal variant).
         while (true) {
             page = node->page(m_fontDescription.script());
             if (page) {
                 GlyphData data = page->glyphDataForCharacter(c);
                 if (data.fontData) {
                     if (!data.fontData->platformData().isVerticalAnyUpright() || data.fontData->isTextOrientationFallback())
                         return data;
 
                     bool isUpright = m_fontDescription.isVerticalUpright(c);
-                    if (isUpright && Character::isCJKIdeographOrSymbol(c)) {
-                        if (!data.fontData->hasVerticalGlyphs()) {
-                            // Use the broken ideograph font data. The broken ideograph font will use the horizontal width of glyphs
-                            // to make sure you get a square (even for broken glyphs like symbols used for punctuation).
-                            variant = BrokenIdeographVariant;
-                            break;
-                        }
-                    } else {
+                    if (!isUpright || !Character::isCJKIdeographOrSymbol(c))
                         return glyphDataForNonCJKCharacterWithGlyphOrientation(c, isUpright, data, pageNumber);
-                    }
 
                     return data;
                 }
 
                 if (node->isSystemFallback())
                     break;
             }
 
             // Proceed with the fallback list.
             node = toGlyphPageTreeNode(node)->getChild(fontDataAt(node->level()), pageNumber);
@@ skipping 45 matching lines @@
     // FIXME: Unclear if this should normalizeSpaces above 0xFFFF.
     // Doing so changes fast/text/international/plane2-diffs.html
     UChar32 characterToRender = c;
     if (characterToRender <=  0xFFFF)
         characterToRender = Character::normalizeSpaces(characterToRender);
 
     const FontData* fontData = fontDataAt(0);
     if (fontData) {
         const SimpleFontData* fontDataToSubstitute = fontData->fontDataForCharacter(characterToRender);
         RefPtr<SimpleFontData> characterFontData = FontCache::fontCache()->fallbackFontForCharacter(m_fontDescription, characterToRender, fontDataToSubstitute);
-        if (characterFontData) {
-            if (characterFontData->platformData().isVerticalAnyUpright() && !characterFontData->hasVerticalGlyphs() && Character::isCJKIdeographOrSymbol(c))
-                variant = BrokenIdeographVariant;
-            if (variant != NormalVariant)
-                characterFontData = characterFontData->variantFontData(m_fontDescription, variant);
+        if (characterFontData && variant != NormalVariant) {
+            characterFontData = characterFontData->variantFontData(m_fontDescription, variant);
         }
         if (characterFontData) {
             // Got the fallback glyph and font.
             GlyphPage* fallbackPage = GlyphPageTreeNode::getRootChild(characterFontData.get(), pageNumber)->page();
             GlyphData data = fallbackPage && fallbackPage->glyphForCharacter(c) ? fallbackPage->glyphDataForCharacter(c) : characterFontData->missingGlyphData();
             // Cache it so we don't have to do system fallback again next time.
             if (variant == NormalVariant) {
                 page->setGlyphDataForCharacter(c, data.glyph, data.fontData);
                 data.fontData->setMaxGlyphPageTreeLevel(std::max(data.fontData->maxGlyphPageTreeLevel(), node->level()));
                 if (data.fontData->platformData().isVerticalAnyUpright() && !data.fontData->isTextOrientationFallback() && !Character::isCJKIdeographOrSymbol(c))
@@ skipping 325 matching lines @@
 {
     return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
 }
 
 bool Font::isFallbackValid() const
 {
     return !m_fontFallbackList || m_fontFallbackList->isValid();
 }
 
 } // namespace blink