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

Side by Side Diff: Source/core/css/resolver/StyleBuilderCustom.cpp

Issue 444333005: Remove custom style building for -webkit-font-feature-settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 if (state.element() && state.element() == state.document().documentElement() ) 1254 if (state.element() && state.element() == state.document().documentElement() )
1255 state.document().setWritingModeSetOnDocumentElement(true); 1255 state.document().setWritingModeSetOnDocumentElement(true);
1256 } 1256 }
1257 1257
1258 void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextOrientation(StyleReso lverState& state, CSSValue* value) 1258 void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextOrientation(StyleReso lverState& state, CSSValue* value)
1259 { 1259 {
1260 if (value->isPrimitiveValue()) 1260 if (value->isPrimitiveValue())
1261 state.setTextOrientation(*toCSSPrimitiveValue(value)); 1261 state.setTextOrientation(*toCSSPrimitiveValue(value));
1262 } 1262 }
1263 1263
1264 // FIXME: We should handle initial and inherit for font-feature-settings
1265 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitFontFeatureSettings(Sty leResolverState& state)
1266 {
1267 }
1268
1269 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitFontFeatureSettings(Sty leResolverState& state)
1270 {
1271 }
1272
1273 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFontFeatureSettings(Style ResolverState& state, CSSValue* value)
1274 {
1275 if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNormal) {
1276 state.fontBuilder().setFeatureSettingsNormal();
1277 return;
1278 }
1279
1280 if (value->isValueList())
1281 state.fontBuilder().setFeatureSettingsValue(value);
1282 }
1283
1284 void StyleBuilderFunctions::applyInheritCSSPropertyBaselineShift(StyleResolverSt ate& state) 1264 void StyleBuilderFunctions::applyInheritCSSPropertyBaselineShift(StyleResolverSt ate& state)
1285 { 1265 {
1286 const SVGRenderStyle& parentSvgStyle = state.parentStyle()->svgStyle(); 1266 const SVGRenderStyle& parentSvgStyle = state.parentStyle()->svgStyle();
1287 EBaselineShift baselineShift = parentSvgStyle.baselineShift(); 1267 EBaselineShift baselineShift = parentSvgStyle.baselineShift();
1288 SVGRenderStyle& svgStyle = state.style()->accessSVGStyle(); 1268 SVGRenderStyle& svgStyle = state.style()->accessSVGStyle();
1289 svgStyle.setBaselineShift(baselineShift); 1269 svgStyle.setBaselineShift(baselineShift);
1290 if (baselineShift == BS_LENGTH) 1270 if (baselineShift == BS_LENGTH)
1291 svgStyle.setBaselineShiftValue(parentSvgStyle.baselineShiftValue()); 1271 svgStyle.setBaselineShiftValue(parentSvgStyle.baselineShiftValue());
1292 } 1272 }
1293 1273
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 break; 1348 break;
1369 default: 1349 default:
1370 ASSERT_NOT_REACHED(); 1350 ASSERT_NOT_REACHED();
1371 break; 1351 break;
1372 } 1352 }
1373 1353
1374 state.style()->setGridAutoFlow(autoFlow); 1354 state.style()->setGridAutoFlow(autoFlow);
1375 } 1355 }
1376 1356
1377 } // namespace blink 1357 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/StyleBuilderConverter.cpp ('k') | Source/platform/fonts/FontDescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698