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

Side by Side Diff: Source/platform/fonts/FontDescription.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 unified diff | Download patch
« no previous file with comments | « Source/platform/fonts/FixedPitchFontType.h ('k') | Source/platform/fonts/FontFallbackList.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 static FontWeight bolderWeight(FontWeight); 148 static FontWeight bolderWeight(FontWeight);
149 static Size largerSize(const Size&); 149 static Size largerSize(const Size&);
150 static Size smallerSize(const Size&); 150 static Size smallerSize(const Size&);
151 GenericFamilyType genericFamily() const { return static_cast<GenericFamilyTy pe>(m_genericFamily); } 151 GenericFamilyType genericFamily() const { return static_cast<GenericFamilyTy pe>(m_genericFamily); }
152 152
153 // only use fixed default size when there is only one font family, and that family is "monospace" 153 // only use fixed default size when there is only one font family, and that family is "monospace"
154 FixedPitchFontType fixedPitchFontType() const 154 FixedPitchFontType fixedPitchFontType() const
155 { 155 {
156 if (genericFamily() == MonospaceFamily && !family().next() && family().f amily() == FontFamilyNames::webkit_monospace) 156 if (genericFamily() == MonospaceFamily && !family().next() && family().f amily() == FontFamilyNames::webkit_monospace)
157 return FixedPitchFont; 157 return FixedPitchFont;
158 return NonFixedPitchFont; 158 return VariablePitchFont;
159 } 159 }
160 Kerning kerning() const { return static_cast<Kerning>(m_kerning); } 160 Kerning kerning() const { return static_cast<Kerning>(m_kerning); }
161 VariantLigatures variantLigatures() const; 161 VariantLigatures variantLigatures() const;
162 LigaturesState commonLigaturesState() const { return static_cast<LigaturesSt ate>(m_commonLigaturesState); } 162 LigaturesState commonLigaturesState() const { return static_cast<LigaturesSt ate>(m_commonLigaturesState); }
163 LigaturesState discretionaryLigaturesState() const { return static_cast<Liga turesState>(m_discretionaryLigaturesState); } 163 LigaturesState discretionaryLigaturesState() const { return static_cast<Liga turesState>(m_discretionaryLigaturesState); }
164 LigaturesState historicalLigaturesState() const { return static_cast<Ligatur esState>(m_historicalLigaturesState); } 164 LigaturesState historicalLigaturesState() const { return static_cast<Ligatur esState>(m_historicalLigaturesState); }
165 LigaturesState contextualLigaturesState() const { return static_cast<Ligatur esState>(m_contextualLigaturesState); } 165 LigaturesState contextualLigaturesState() const { return static_cast<Ligatur esState>(m_contextualLigaturesState); }
166 unsigned keywordSize() const { return m_keywordSize; } 166 unsigned keywordSize() const { return m_keywordSize; }
167 FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMo de>(m_fontSmoothing); } 167 FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMo de>(m_fontSmoothing); }
168 TextRenderingMode textRendering() const { return static_cast<TextRenderingMo de>(m_textRendering); } 168 TextRenderingMode textRendering() const { return static_cast<TextRenderingMo de>(m_textRendering); }
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 && m_script == other.m_script 308 && m_script == other.m_script
309 && m_syntheticBold == other.m_syntheticBold 309 && m_syntheticBold == other.m_syntheticBold
310 && m_syntheticItalic == other.m_syntheticItalic 310 && m_syntheticItalic == other.m_syntheticItalic
311 && m_featureSettings == other.m_featureSettings 311 && m_featureSettings == other.m_featureSettings
312 && m_subpixelTextPosition == other.m_subpixelTextPosition; 312 && m_subpixelTextPosition == other.m_subpixelTextPosition;
313 } 313 }
314 314
315 } // namespace blink 315 } // namespace blink
316 316
317 #endif 317 #endif
OLDNEW
« no previous file with comments | « Source/platform/fonts/FixedPitchFontType.h ('k') | Source/platform/fonts/FontFallbackList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698