Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h

Issue 1758383002: Revert of Use FontFallbackPriority Fonts in FontFallbackIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
index 643b805fc9599264e6cdee5bedb8026ff396c88d..4e054bb7ac6ec42461695c493c83c16fb226267d 100644
--- a/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
+++ b/third_party/WebKit/Source/platform/fonts/FontFallbackIterator.h
@@ -6,7 +6,6 @@
#define FontFallbackIterator_h
#include "platform/fonts/FontDataRange.h"
-#include "platform/fonts/FontFallbackPriority.h"
#include "wtf/HashMap.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefCounted.h"
@@ -28,8 +27,7 @@
WTF_MAKE_NONCOPYABLE(FontFallbackIterator);
public:
- static PassRefPtr<FontFallbackIterator> create(const FontDescription&, PassRefPtr<FontFallbackList>,
- FontFallbackPriority);
+ static PassRefPtr<FontFallbackIterator> create(const FontDescription&, PassRefPtr<FontFallbackList>);
// Returns whether a list of all remaining characters to be shaped is
// needed. Needed by the FontfallbackIterator in order to check whether a
@@ -44,13 +42,11 @@
const FontDataRange next(const Vector<UChar32>& hintList);
private:
- FontFallbackIterator(const FontDescription&, PassRefPtr<FontFallbackList>,
- FontFallbackPriority);
+ FontFallbackIterator(const FontDescription&, PassRefPtr<FontFallbackList>);
bool rangeContributesForHint(const Vector<UChar32> hintList, const FontDataRange&);
bool alreadyLoadingRangeForHintChar(UChar32 hintChar);
void willUseRange(const AtomicString& family, const FontDataRange&);
- const PassRefPtr<SimpleFontData> fallbackPriorityFont(UChar32 hint);
const PassRefPtr<SimpleFontData> uniqueSystemFontForHint(UChar32 hint);
const FontDescription& m_fontDescription;
@@ -59,7 +55,6 @@
unsigned m_segmentedIndex;
enum FallbackStage {
- FallbackPriorityFonts,
FontGroupFonts,
SegmentedFace,
PreferencesFonts,
@@ -70,7 +65,6 @@
FallbackStage m_fallbackStage;
HashMap<UChar32, RefPtr<SimpleFontData>> m_visitedSystemFonts;
Vector<FontDataRange> m_loadingCustomFontForRanges;
- FontFallbackPriority m_fontFallbackPriority;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698