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

Unified Diff: Source/platform/fonts/FontFallbackList.cpp

Issue 1020833002: Remove duplicate Enum Font Pitch (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebasing patch Created 5 years, 9 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
« no previous file with comments | « Source/platform/fonts/FontFallbackList.h ('k') | Source/platform/fonts/SimpleFontData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/FontFallbackList.cpp
diff --git a/Source/platform/fonts/FontFallbackList.cpp b/Source/platform/fonts/FontFallbackList.cpp
index be38a01b2218e1716789d79e39fc13b505893500..e905ceeaed213016905e13c27bd9611b756a9b86 100644
--- a/Source/platform/fonts/FontFallbackList.cpp
+++ b/Source/platform/fonts/FontFallbackList.cpp
@@ -45,7 +45,7 @@ FontFallbackList::FontFallbackList()
, m_fontSelectorVersion(0)
, m_familyIndex(0)
, m_generation(FontCache::fontCache()->generation())
- , m_pitch(UnknownPitch)
+ , m_pitch(UnknownPitchFont)
, m_hasLoadingFallback(false)
{
}
@@ -58,7 +58,7 @@ void FontFallbackList::invalidate(PassRefPtrWillBeRawPtr<FontSelector> fontSelec
m_pages.clear();
m_cachedPrimarySimpleFontData = 0;
m_familyIndex = 0;
- m_pitch = UnknownPitch;
+ m_pitch = UnknownPitchFont;
m_hasLoadingFallback = false;
m_fontSelector = fontSelector;
m_fontSelectorVersion = m_fontSelector ? m_fontSelector->version() : 0;
@@ -83,7 +83,7 @@ void FontFallbackList::determinePitch(const FontDescription& fontDescription) co
const FontData* fontData = fontDataAt(fontDescription, fontIndex);
if (!fontData) {
// All fonts are custom fonts and are loading. Fallback should be variable pitch.
- m_pitch = VariablePitch;
+ m_pitch = VariablePitchFont;
break;
}
@@ -91,7 +91,7 @@ void FontFallbackList::determinePitch(const FontDescription& fontDescription) co
if (fontData->isSegmented()) {
const SegmentedFontData* segmentedFontData = toSegmentedFontData(fontData);
if (segmentedFontData->numRanges() != 1 || !segmentedFontData->rangeAt(0).isEntireRange()) {
- m_pitch = VariablePitch;
+ m_pitch = VariablePitchFont;
break;
}
simpleFontData = segmentedFontData->rangeAt(0).fontData().get();
« no previous file with comments | « Source/platform/fonts/FontFallbackList.h ('k') | Source/platform/fonts/SimpleFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698