Reland: Use FontFallbackPriority Fonts in FontFallbackIterator

third_party/WebKit/Source/platform/fonts/Font.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Holger Hans Peter Freyther
  *
  * 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 11 matching lines @@
  *
  */
 
 #ifndef Font_h
 #define Font_h
 
 #include "platform/LayoutUnit.h"
 #include "platform/PlatformExport.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFallbackList.h"
+#include "platform/fonts/FontFallbackPriority.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/text/TabSize.h"
 #include "platform/text/TextDirection.h"
 #include "platform/text/TextPath.h"
 #include "wtf/Allocator.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/CharacterNames.h"
 
@@ skipping 90 matching lines @@
     float floatWidthForComplexText(const TextRun&, HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* glyphBounds) const;
     int offsetForPositionForComplexText(const TextRun&, float position, bool includePartialGlyphs) const;
     FloatRect selectionRectForComplexText(const TextRun&, const FloatPoint&, int h, int from, int to) const;
 
     bool computeCanShapeWordByWord() const;
 
     friend struct SimpleShaper;
 
 public:
     FontSelector* fontSelector() const;
-    PassRefPtr<FontFallbackIterator> createFontFallbackIterator() const;
+    PassRefPtr<FontFallbackIterator> createFontFallbackIterator(
+        FontFallbackPriority) const;
 
     void willUseFontData(UChar32) const;
 
     bool loadingCustomFonts() const;
     bool isFallbackValid() const;
 
 private:
     bool shouldSkipDrawing() const
     {
         return m_fontFallbackList && m_fontFallbackList->shouldSkipDrawing();
@@ skipping 40 matching lines @@
     // if the distance to the next tab stop is less than that, advance an additional tab stop.
     if (distanceToTabStop < std::max(fontDescription().letterSpacing(), LayoutUnit::epsilon()))
         distanceToTabStop += baseTabWidth;
 
     return distanceToTabStop;
 }
 
 } // namespace blink
 
 #endif