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

Side by Side Diff: Source/platform/fonts/FontDescription.h

Issue 1135003004: Make small-caps work correctly with tr locale (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: add back TestExpectations change Created 5 years, 6 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/Font.cpp ('k') | Source/platform/fonts/FontDescription.cpp » ('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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 Kerning kerning() const { return static_cast<Kerning>(m_kerning); } 155 Kerning kerning() const { return static_cast<Kerning>(m_kerning); }
156 VariantLigatures variantLigatures() const; 156 VariantLigatures variantLigatures() const;
157 LigaturesState commonLigaturesState() const { return static_cast<LigaturesSt ate>(m_commonLigaturesState); } 157 LigaturesState commonLigaturesState() const { return static_cast<LigaturesSt ate>(m_commonLigaturesState); }
158 LigaturesState discretionaryLigaturesState() const { return static_cast<Liga turesState>(m_discretionaryLigaturesState); } 158 LigaturesState discretionaryLigaturesState() const { return static_cast<Liga turesState>(m_discretionaryLigaturesState); }
159 LigaturesState historicalLigaturesState() const { return static_cast<Ligatur esState>(m_historicalLigaturesState); } 159 LigaturesState historicalLigaturesState() const { return static_cast<Ligatur esState>(m_historicalLigaturesState); }
160 LigaturesState contextualLigaturesState() const { return static_cast<Ligatur esState>(m_contextualLigaturesState); } 160 LigaturesState contextualLigaturesState() const { return static_cast<Ligatur esState>(m_contextualLigaturesState); }
161 unsigned keywordSize() const { return m_keywordSize; } 161 unsigned keywordSize() const { return m_keywordSize; }
162 FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMo de>(m_fontSmoothing); } 162 FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMo de>(m_fontSmoothing); }
163 TextRenderingMode textRendering() const { return static_cast<TextRenderingMo de>(m_textRendering); } 163 TextRenderingMode textRendering() const { return static_cast<TextRenderingMo de>(m_textRendering); }
164 UScriptCode script() const { return static_cast<UScriptCode>(m_script); } 164 UScriptCode script() const { return static_cast<UScriptCode>(m_script); }
165 const AtomicString& locale() const; 165 const AtomicString& locale(bool includeDefault = true) const;
166 bool isSyntheticBold() const { return m_syntheticBold; } 166 bool isSyntheticBold() const { return m_syntheticBold; }
167 bool isSyntheticItalic() const { return m_syntheticItalic; } 167 bool isSyntheticItalic() const { return m_syntheticItalic; }
168 bool useSubpixelPositioning() const { return m_subpixelTextPosition; } 168 bool useSubpixelPositioning() const { return m_subpixelTextPosition; }
169 169
170 FontTraits traits() const; 170 FontTraits traits() const;
171 float wordSpacing() const { return m_wordSpacing; } 171 float wordSpacing() const { return m_wordSpacing; }
172 float letterSpacing() const { return m_letterSpacing; } 172 float letterSpacing() const { return m_letterSpacing; }
173 FontOrientation orientation() const { return static_cast<FontOrientation>(m_ orientation); } 173 FontOrientation orientation() const { return static_cast<FontOrientation>(m_ orientation); }
174 bool isVerticalAnyUpright() const { return blink::isVerticalAnyUpright(orien tation()); } 174 bool isVerticalAnyUpright() const { return blink::isVerticalAnyUpright(orien tation()); }
175 bool isVerticalNonCJKUpright() const { return blink::isVerticalNonCJKUpright (orientation()); } 175 bool isVerticalNonCJKUpright() const { return blink::isVerticalNonCJKUpright (orientation()); }
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 && m_script == other.m_script 302 && m_script == other.m_script
303 && m_syntheticBold == other.m_syntheticBold 303 && m_syntheticBold == other.m_syntheticBold
304 && m_syntheticItalic == other.m_syntheticItalic 304 && m_syntheticItalic == other.m_syntheticItalic
305 && m_featureSettings == other.m_featureSettings 305 && m_featureSettings == other.m_featureSettings
306 && m_subpixelTextPosition == other.m_subpixelTextPosition; 306 && m_subpixelTextPosition == other.m_subpixelTextPosition;
307 } 307 }
308 308
309 } // namespace blink 309 } // namespace blink
310 310
311 #endif 311 #endif
OLDNEW
« no previous file with comments | « Source/platform/fonts/Font.cpp ('k') | Source/platform/fonts/FontDescription.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698