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

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

Issue 186403002: Make font-related CSS properties less custom. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed comments. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | Source/platform/fonts/mac/FontMac.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) 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 184
185 TypesettingFeatures FontDescription::defaultTypesettingFeatures() 185 TypesettingFeatures FontDescription::defaultTypesettingFeatures()
186 { 186 {
187 return s_defaultTypesettingFeatures; 187 return s_defaultTypesettingFeatures;
188 } 188 }
189 189
190 void FontDescription::updateTypesettingFeatures() const 190 void FontDescription::updateTypesettingFeatures() const
191 { 191 {
192 m_typesettingFeatures = s_defaultTypesettingFeatures; 192 m_typesettingFeatures = s_defaultTypesettingFeatures;
193 193
194 switch (textRenderingMode()) { 194 switch (textRendering()) {
195 case AutoTextRendering: 195 case AutoTextRendering:
196 break; 196 break;
197 case OptimizeSpeed: 197 case OptimizeSpeed:
198 m_typesettingFeatures &= ~(WebCore::Kerning | Ligatures); 198 m_typesettingFeatures &= ~(WebCore::Kerning | Ligatures);
199 break; 199 break;
200 case GeometricPrecision: 200 case GeometricPrecision:
201 case OptimizeLegibility: 201 case OptimizeLegibility:
202 m_typesettingFeatures |= WebCore::Kerning | Ligatures; 202 m_typesettingFeatures |= WebCore::Kerning | Ligatures;
203 break; 203 break;
204 } 204 }
(...skipping 15 matching lines...) Expand all
220 break; 220 break;
221 case FontDescription::EnabledLigaturesState: 221 case FontDescription::EnabledLigaturesState:
222 m_typesettingFeatures |= Ligatures; 222 m_typesettingFeatures |= Ligatures;
223 break; 223 break;
224 case FontDescription::NormalLigaturesState: 224 case FontDescription::NormalLigaturesState:
225 break; 225 break;
226 } 226 }
227 } 227 }
228 228
229 } // namespace WebCore 229 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontDescription.h ('k') | Source/platform/fonts/mac/FontMac.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698