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

Side by Side Diff: Source/WebCore/platform/graphics/FontDescription.h

Issue 10452002: Merge 116698 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 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 | « LayoutTests/fast/css/large-font-size-crash-expected.txt ('k') | no next file » | 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 131
132 FontTraitsMask traitsMask() const; 132 FontTraitsMask traitsMask() const;
133 bool isSpecifiedFont() const { return m_isSpecifiedFont; } 133 bool isSpecifiedFont() const { return m_isSpecifiedFont; }
134 FontOrientation orientation() const { return static_cast<FontOrientation>(m_ orientation); } 134 FontOrientation orientation() const { return static_cast<FontOrientation>(m_ orientation); }
135 TextOrientation textOrientation() const { return static_cast<TextOrientation >(m_textOrientation); } 135 TextOrientation textOrientation() const { return static_cast<TextOrientation >(m_textOrientation); }
136 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant> (m_widthVariant); } 136 FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant> (m_widthVariant); }
137 FontFeatureSettings* featureSettings() const { return m_featureSettings.get( ); } 137 FontFeatureSettings* featureSettings() const { return m_featureSettings.get( ); }
138 FontDescription makeNormalFeatureSettings() const; 138 FontDescription makeNormalFeatureSettings() const;
139 139
140 void setFamily(const FontFamily& family) { m_familyList = family; } 140 void setFamily(const FontFamily& family) { m_familyList = family; }
141 void setComputedSize(float s) { ASSERT(isfinite(s)); m_computedSize = s; } 141 void setComputedSize(float s) { m_computedSize = clampToFloat(s); }
142 void setSpecifiedSize(float s) { ASSERT(isfinite(s)); m_specifiedSize = s; } 142 void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); }
143 void setItalic(FontItalic i) { m_italic = i; } 143 void setItalic(FontItalic i) { m_italic = i; }
144 void setItalic(bool i) { setItalic(i ? FontItalicOn : FontItalicOff); } 144 void setItalic(bool i) { setItalic(i ? FontItalicOn : FontItalicOff); }
145 void setSmallCaps(FontSmallCaps c) { m_smallCaps = c; } 145 void setSmallCaps(FontSmallCaps c) { m_smallCaps = c; }
146 void setSmallCaps(bool c) { setSmallCaps(c ? FontSmallCapsOn : FontSmallCaps Off); } 146 void setSmallCaps(bool c) { setSmallCaps(c ? FontSmallCapsOn : FontSmallCaps Off); }
147 void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; } 147 void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
148 void setWeight(FontWeight w) { m_weight = w; } 148 void setWeight(FontWeight w) { m_weight = w; }
149 void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = g enericFamily; } 149 void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = g enericFamily; }
150 #if PLATFORM(CHROMIUM) && OS(DARWIN) 150 #if PLATFORM(CHROMIUM) && OS(DARWIN)
151 void setUsePrinterFont(bool) { } 151 void setUsePrinterFont(bool) { }
152 #else 152 #else
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 && m_orientation == other.m_orientation 228 && m_orientation == other.m_orientation
229 && m_textOrientation == other.m_textOrientation 229 && m_textOrientation == other.m_textOrientation
230 && m_widthVariant == other.m_widthVariant 230 && m_widthVariant == other.m_widthVariant
231 && m_script == other.m_script 231 && m_script == other.m_script
232 && m_featureSettings == other.m_featureSettings; 232 && m_featureSettings == other.m_featureSettings;
233 } 233 }
234 234
235 } 235 }
236 236
237 #endif 237 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/large-font-size-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698