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

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

Issue 641643004: Reapply the non-MathExtras parts of (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/LayoutUnit.h ('k') | Source/platform/geometry/DoublePoint.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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 float letterSpacing() const { return m_letterSpacing; } 171 float letterSpacing() const { return m_letterSpacing; }
172 FontOrientation orientation() const { return static_cast<FontOrientation>(m_ orientation); } 172 FontOrientation orientation() const { return static_cast<FontOrientation>(m_ orientation); }
173 NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<N onCJKGlyphOrientation>(m_nonCJKGlyphOrientation); } 173 NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<N onCJKGlyphOrientation>(m_nonCJKGlyphOrientation); }
174 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant> (m_widthVariant); } 174 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant> (m_widthVariant); }
175 FontFeatureSettings* featureSettings() const { return m_featureSettings.get( ); } 175 FontFeatureSettings* featureSettings() const { return m_featureSettings.get( ); }
176 176
177 float effectiveFontSize() const; // Returns either the computedSize or the c omputedPixelSize 177 float effectiveFontSize() const; // Returns either the computedSize or the c omputedPixelSize
178 FontCacheKey cacheKey(const FontFaceCreationParams&, FontTraits desiredTrait s = FontTraits(0)) const; 178 FontCacheKey cacheKey(const FontFaceCreationParams&, FontTraits desiredTrait s = FontTraits(0)) const;
179 179
180 void setFamily(const FontFamily& family) { m_familyList = family; } 180 void setFamily(const FontFamily& family) { m_familyList = family; }
181 void setComputedSize(float s) { m_computedSize = clampToFloat(s); } 181 void setComputedSize(float s) { m_computedSize = clampTo<float>(s); }
182 void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); } 182 void setSpecifiedSize(float s) { m_specifiedSize = clampTo<float>(s); }
183 void setStyle(FontStyle i) { m_style = i; } 183 void setStyle(FontStyle i) { m_style = i; }
184 void setVariant(FontVariant c) { m_variant = c; } 184 void setVariant(FontVariant c) { m_variant = c; }
185 void setVariantLigatures(const VariantLigatures&); 185 void setVariantLigatures(const VariantLigatures&);
186 void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; } 186 void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
187 void setWeight(FontWeight w) { m_weight = w; } 187 void setWeight(FontWeight w) { m_weight = w; }
188 void setStretch(FontStretch s) { m_stretch = s; } 188 void setStretch(FontStretch s) { m_stretch = s; }
189 void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = g enericFamily; } 189 void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = g enericFamily; }
190 void setKerning(Kerning kerning) { m_kerning = kerning; updateTypesettingFea tures(); } 190 void setKerning(Kerning kerning) { m_kerning = kerning; updateTypesettingFea tures(); }
191 void setKeywordSize(unsigned s) { m_keywordSize = s; } 191 void setKeywordSize(unsigned s) { m_keywordSize = s; }
192 void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = smoot hing; } 192 void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = smoot hing; }
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 && m_script == other.m_script 290 && m_script == other.m_script
291 && m_syntheticBold == other.m_syntheticBold 291 && m_syntheticBold == other.m_syntheticBold
292 && m_syntheticItalic == other.m_syntheticItalic 292 && m_syntheticItalic == other.m_syntheticItalic
293 && m_featureSettings == other.m_featureSettings 293 && m_featureSettings == other.m_featureSettings
294 && m_subpixelTextPosition == other.m_subpixelTextPosition; 294 && m_subpixelTextPosition == other.m_subpixelTextPosition;
295 } 295 }
296 296
297 } // namespace blink 297 } // namespace blink
298 298
299 #endif 299 #endif
OLDNEW
« no previous file with comments | « Source/platform/LayoutUnit.h ('k') | Source/platform/geometry/DoublePoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698