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

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

Issue 447443003: Remove custom style building for font-variant-ligatures. (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 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 } 895 }
896 } 896 }
897 897
898 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState & state, CSSValue* value) 898 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState & state, CSSValue* value)
899 { 899 {
900 FilterOperations operations; 900 FilterOperations operations;
901 if (FilterOperationResolver::createFilterOperations(value, state.cssToLength ConversionData(), operations, state)) 901 if (FilterOperationResolver::createFilterOperations(value, state.cssToLength ConversionData(), operations, state))
902 state.style()->setFilter(operations); 902 state.style()->setFilter(operations);
903 } 903 }
904 904
905 void StyleBuilderFunctions::applyInitialCSSPropertyFontVariantLigatures(StyleRes olverState& state)
906 {
907 state.fontBuilder().setFontVariantLigaturesInitial();
908 }
909
910 void StyleBuilderFunctions::applyInheritCSSPropertyFontVariantLigatures(StyleRes olverState& state)
911 {
912 state.fontBuilder().setFontVariantLigaturesInherit(state.parentFontDescripti on());
913 }
914
915 void StyleBuilderFunctions::applyValueCSSPropertyFontVariantLigatures(StyleResol verState& state, CSSValue* value)
916 {
917 state.fontBuilder().setFontVariantLigaturesValue(value);
918 }
919
920 void StyleBuilderFunctions::applyValueCSSPropertyInternalMarqueeIncrement(StyleR esolverState& state, CSSValue* value) 905 void StyleBuilderFunctions::applyValueCSSPropertyInternalMarqueeIncrement(StyleR esolverState& state, CSSValue* value)
921 { 906 {
922 if (!value->isPrimitiveValue()) 907 if (!value->isPrimitiveValue())
923 return; 908 return;
924 909
925 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 910 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
926 if (primitiveValue->getValueID()) { 911 if (primitiveValue->getValueID()) {
927 switch (primitiveValue->getValueID()) { 912 switch (primitiveValue->getValueID()) {
928 case CSSValueSmall: 913 case CSSValueSmall:
929 state.style()->setMarqueeIncrement(Length(1, Fixed)); // 1px. 914 state.style()->setMarqueeIncrement(Length(1, Fixed)); // 1px.
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 break; 1398 break;
1414 default: 1399 default:
1415 ASSERT_NOT_REACHED(); 1400 ASSERT_NOT_REACHED();
1416 break; 1401 break;
1417 } 1402 }
1418 1403
1419 state.style()->setGridAutoFlow(autoFlow); 1404 state.style()->setGridAutoFlow(autoFlow);
1420 } 1405 }
1421 1406
1422 } // namespace blink 1407 } // 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