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

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

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/FontDescription.h ('k') | Source/platform/fonts/FontFallbackList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/FontFallbackList.h
diff --git a/Source/platform/fonts/FontFallbackList.h b/Source/platform/fonts/FontFallbackList.h
index 058d9a7dbaede0826e076507220d348128ad1e68..fa7b9ac567604421a47a2f4cead3a8953b6ec541 100644
--- a/Source/platform/fonts/FontFallbackList.h
+++ b/Source/platform/fonts/FontFallbackList.h
@@ -21,6 +21,7 @@
#ifndef FontFallbackList_h
#define FontFallbackList_h
+#include "platform/fonts/FixedPitchFontType.h"
#include "platform/fonts/FontSelector.h"
#include "platform/fonts/SimpleFontData.h"
#include "platform/fonts/WidthCache.h"
@@ -67,9 +68,9 @@ public:
bool isFixedPitch(const FontDescription& fontDescription) const
{
- if (m_pitch == UnknownPitch)
+ if (m_pitch == UnknownPitchFont)
determinePitch(fontDescription);
- return m_pitch == FixedPitch;
+ return m_pitch == FixedPitchFont;
}
void determinePitch(const FontDescription&) const;
@@ -123,7 +124,7 @@ private:
unsigned m_fontSelectorVersion;
mutable int m_familyIndex;
unsigned short m_generation;
- mutable unsigned m_pitch : 3; // Pitch
+ mutable FixedPitchFontType m_pitch : 3; // Pitch
mutable bool m_hasLoadingFallback : 1;
};
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | Source/platform/fonts/FontFallbackList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698