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

Unified Diff: Source/platform/fonts/SimpleFontData.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/FontFallbackList.cpp ('k') | Source/platform/fonts/SimpleFontData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/SimpleFontData.h
diff --git a/Source/platform/fonts/SimpleFontData.h b/Source/platform/fonts/SimpleFontData.h
index 2084209c073b84b8844138dc1c8ba84c16b17337..0983426a86b5aa3c0d7afc81744ace5b1a9cb8b4 100644
--- a/Source/platform/fonts/SimpleFontData.h
+++ b/Source/platform/fonts/SimpleFontData.h
@@ -26,6 +26,7 @@
#include "platform/PlatformExport.h"
#include "platform/fonts/CustomFontData.h"
+#include "platform/fonts/FixedPitchFontType.h"
#include "platform/fonts/FontBaseline.h"
#include "platform/fonts/FontData.h"
#include "platform/fonts/FontMetrics.h"
@@ -48,7 +49,6 @@ namespace blink {
class FontDescription;
enum FontDataVariant { AutoVariant, NormalVariant, SmallCapsVariant, EmphasisMarkVariant, BrokenIdeographVariant };
-enum Pitch { UnknownPitch, FixedPitch, VariablePitch };
class PLATFORM_EXPORT SimpleFontData : public FontData {
public:
@@ -121,7 +121,7 @@ public:
Glyph glyphForCharacter(UChar32) const;
void determinePitch();
- Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitch; }
+ FixedPitchFontType pitch() const { return m_pitch; }
virtual bool isCustomFont() const override { return m_customFontData; }
virtual bool isLoading() const override { return m_customFontData ? m_customFontData->isLoading() : false; }
@@ -164,7 +164,7 @@ private:
mutable OwnPtr<GlyphMetricsMap<FloatRect>> m_glyphToBoundsMap;
mutable GlyphMetricsMap<float> m_glyphToWidthMap;
- bool m_treatAsFixedPitch;
+ FixedPitchFontType m_pitch;
bool m_isTextOrientationFallback;
bool m_isBrokenIdeographFallback;
« no previous file with comments | « Source/platform/fonts/FontFallbackList.cpp ('k') | Source/platform/fonts/SimpleFontData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698