Reland: Use FontFallbackPriority Fonts in FontFallbackIterator

third_party/WebKit/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 490 matching lines @@
             if (data.glyph != verticalRightData.glyph)
                 return data;
             // The glyphs are identical, meaning that we should just use the horizontal glyph.
             if (verticalRightData.fontData)
                 return verticalRightData;
         }
     }
     return data;
 }
 
-PassRefPtr<FontFallbackIterator> Font::createFontFallbackIterator() const
+PassRefPtr<FontFallbackIterator> Font::createFontFallbackIterator(
+    FontFallbackPriority fallbackPriority) const
 {
-    return FontFallbackIterator::create(m_fontDescription, m_fontFallbackList);
+    return FontFallbackIterator::create(m_fontDescription,
+        m_fontFallbackList,
+        fallbackPriority);
 }
 
 GlyphData Font::glyphDataForCharacter(UChar32& c, bool mirror, bool normalizeSpace, FontDataVariant variant) const
 {
     ASSERT(isMainThread());
 
     if (variant == AutoVariant) {
         if (m_fontDescription.variant() == FontVariantSmallCaps) {
             bool includeDefault = false;
             UChar32 upperC = toUpper(c, m_fontDescription.locale(includeDefault));
@@ skipping 300 matching lines @@
 {
     return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
 }
 
 bool Font::isFallbackValid() const
 {
     return !m_fontFallbackList || m_fontFallbackList->isValid();
 }
 
 } // namespace blink