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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/FontDescription.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com> 2 * Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com>
3 * Copyright (C) 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 break; 196 break;
197 case OptimizeSpeed: 197 case OptimizeSpeed:
198 m_fields.m_typesettingFeatures &= ~(blink::Kerning | Ligatures); 198 m_fields.m_typesettingFeatures &= ~(blink::Kerning | Ligatures);
199 break; 199 break;
200 case GeometricPrecision: 200 case GeometricPrecision:
201 case OptimizeLegibility: 201 case OptimizeLegibility:
202 m_fields.m_typesettingFeatures |= blink::Kerning | Ligatures; 202 m_fields.m_typesettingFeatures |= blink::Kerning | Ligatures;
203 break; 203 break;
204 } 204 }
205 205
206 switch (kerning()) { 206 switch (getKerning()) {
207 case FontDescription::NoneKerning: 207 case FontDescription::NoneKerning:
208 m_fields.m_typesettingFeatures &= ~blink::Kerning; 208 m_fields.m_typesettingFeatures &= ~blink::Kerning;
209 break; 209 break;
210 case FontDescription::NormalKerning: 210 case FontDescription::NormalKerning:
211 m_fields.m_typesettingFeatures |= blink::Kerning; 211 m_fields.m_typesettingFeatures |= blink::Kerning;
212 break; 212 break;
213 case FontDescription::AutoKerning: 213 case FontDescription::AutoKerning:
214 break; 214 break;
215 } 215 }
216 216
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 addFloatToHash(hash, m_sizeAdjust); 272 addFloatToHash(hash, m_sizeAdjust);
273 addFloatToHash(hash, m_letterSpacing); 273 addFloatToHash(hash, m_letterSpacing);
274 addFloatToHash(hash, m_wordSpacing); 274 addFloatToHash(hash, m_wordSpacing);
275 addToHash(hash, m_fieldsAsUnsigned[0]); 275 addToHash(hash, m_fieldsAsUnsigned[0]);
276 addToHash(hash, m_fieldsAsUnsigned[1]); 276 addToHash(hash, m_fieldsAsUnsigned[1]);
277 277
278 return hash; 278 return hash;
279 } 279 }
280 280
281 } // namespace blink 281 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698