Source/core/platform/graphics/FontDescription.h - Issue 14107015: Rename OS(DARWIN) to OS(MACOSX).

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

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 7 years, 3 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/core/platform/graphics/FontCustomPlatformData.h ('k') | Source/core/platform/graphics/FontPlatformData.h » ('j') | no next file with comments »

OLD	NEW
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 126 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 void setFamily(const FontFamily& family) { m_familyList = family; }	137 void setFamily(const FontFamily& family) { m_familyList = family; }

138 void setComputedSize(float s) { m_computedSize = clampToFloat(s); }	138 void setComputedSize(float s) { m_computedSize = clampToFloat(s); }

139 void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); }	139 void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); }

140 void setItalic(FontItalic i) { m_italic = i; }	140 void setItalic(FontItalic i) { m_italic = i; }

141 void setItalic(bool i) { setItalic(i ? FontItalicOn : FontItalicOff); }	141 void setItalic(bool i) { setItalic(i ? FontItalicOn : FontItalicOff); }

142 void setSmallCaps(FontSmallCaps c) { m_smallCaps = c; }	142 void setSmallCaps(FontSmallCaps c) { m_smallCaps = c; }

143 void setSmallCaps(bool c) { setSmallCaps(c ? FontSmallCapsOn : FontSmallCaps Off); }	143 void setSmallCaps(bool c) { setSmallCaps(c ? FontSmallCapsOn : FontSmallCaps Off); }

144 void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }	144 void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }

145 void setWeight(FontWeight w) { m_weight = w; }	145 void setWeight(FontWeight w) { m_weight = w; }

146 void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = g enericFamily; }	146 void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = g enericFamily; }

147 #if OS(DARWIN)	147 #if OS(MACOSX)

148 void setUsePrinterFont(bool) { }	148 void setUsePrinterFont(bool) { }

149 #else	149 #else

150 void setUsePrinterFont(bool p) { m_usePrinterFont = p; }	150 void setUsePrinterFont(bool p) { m_usePrinterFont = p; }

151 #endif	151 #endif

152 void setKerning(Kerning kerning) { m_kerning = kerning; }	152 void setKerning(Kerning kerning) { m_kerning = kerning; }

153 void setCommonLigaturesState(LigaturesState commonLigaturesState) { m_common LigaturesState = commonLigaturesState; }	153 void setCommonLigaturesState(LigaturesState commonLigaturesState) { m_common LigaturesState = commonLigaturesState; }

154 void setDiscretionaryLigaturesState(LigaturesState discretionaryLigaturesSta te) { m_discretionaryLigaturesState = discretionaryLigaturesState; }	154 void setDiscretionaryLigaturesState(LigaturesState discretionaryLigaturesSta te) { m_discretionaryLigaturesState = discretionaryLigaturesState; }

155 void setHistoricalLigaturesState(LigaturesState historicalLigaturesState) { m_historicalLigaturesState = historicalLigaturesState; }	155 void setHistoricalLigaturesState(LigaturesState historicalLigaturesState) { m_historicalLigaturesState = historicalLigaturesState; }

156 void setKeywordSize(unsigned s) { m_keywordSize = s; }	156 void setKeywordSize(unsigned s) { m_keywordSize = s; }

157 void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = smoot hing; }	157 void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = smoot hing; }

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
222 && m_orientation == other.m_orientation	222 && m_orientation == other.m_orientation

223 && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation	223 && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation

224 && m_widthVariant == other.m_widthVariant	224 && m_widthVariant == other.m_widthVariant

225 && m_script == other.m_script	225 && m_script == other.m_script

226 && m_featureSettings == other.m_featureSettings;	226 && m_featureSettings == other.m_featureSettings;

227 }	227 }

228	228

229 }	229 }

230	230

231 #endif	231 #endif

OLD	NEW