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

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

Issue 436563002: Remove value packing and custom style building for text-underline-position. (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
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('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) 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 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
1049 1049
1050 if (primitiveValue->getValueID() == CSSValueFilled || primitiveValue->getVal ueID() == CSSValueOpen) { 1050 if (primitiveValue->getValueID() == CSSValueFilled || primitiveValue->getVal ueID() == CSSValueOpen) {
1051 state.style()->setTextEmphasisFill(*primitiveValue); 1051 state.style()->setTextEmphasisFill(*primitiveValue);
1052 state.style()->setTextEmphasisMark(TextEmphasisMarkAuto); 1052 state.style()->setTextEmphasisMark(TextEmphasisMarkAuto);
1053 } else { 1053 } else {
1054 state.style()->setTextEmphasisFill(TextEmphasisFillFilled); 1054 state.style()->setTextEmphasisFill(TextEmphasisFillFilled);
1055 state.style()->setTextEmphasisMark(*primitiveValue); 1055 state.style()->setTextEmphasisMark(*primitiveValue);
1056 } 1056 }
1057 } 1057 }
1058 1058
1059 void StyleBuilderFunctions::applyValueCSSPropertyTextUnderlinePosition(StyleReso lverState& state, CSSValue* value)
1060 {
1061 // This is true if value is 'auto' or 'alphabetic'.
1062 if (value->isPrimitiveValue()) {
1063 TextUnderlinePosition t = *toCSSPrimitiveValue(value);
1064 state.style()->setTextUnderlinePosition(t);
1065 return;
1066 }
1067
1068 unsigned t = 0;
1069 for (CSSValueListIterator i(value); i.hasMore(); i.advance()) {
1070 CSSValue* item = i.value();
1071 TextUnderlinePosition t2 = *toCSSPrimitiveValue(item);
1072 t |= t2;
1073 }
1074 state.style()->setTextUnderlinePosition(static_cast<TextUnderlinePosition>(t ));
1075 }
1076
1077 void StyleBuilderFunctions::applyInitialCSSPropertyWillChange(StyleResolverState & state) 1059 void StyleBuilderFunctions::applyInitialCSSPropertyWillChange(StyleResolverState & state)
1078 { 1060 {
1079 state.style()->setWillChangeContents(false); 1061 state.style()->setWillChangeContents(false);
1080 state.style()->setWillChangeScrollPosition(false); 1062 state.style()->setWillChangeScrollPosition(false);
1081 state.style()->setWillChangeProperties(Vector<CSSPropertyID>()); 1063 state.style()->setWillChangeProperties(Vector<CSSPropertyID>());
1082 state.style()->setSubtreeWillChangeContents(state.parentStyle()->subtreeWill ChangeContents()); 1064 state.style()->setSubtreeWillChangeContents(state.parentStyle()->subtreeWill ChangeContents());
1083 } 1065 }
1084 1066
1085 void StyleBuilderFunctions::applyInheritCSSPropertyWillChange(StyleResolverState & state) 1067 void StyleBuilderFunctions::applyInheritCSSPropertyWillChange(StyleResolverState & state)
1086 { 1068 {
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 break; 1422 break;
1441 default: 1423 default:
1442 ASSERT_NOT_REACHED(); 1424 ASSERT_NOT_REACHED();
1443 break; 1425 break;
1444 } 1426 }
1445 1427
1446 state.style()->setGridAutoFlow(autoFlow); 1428 state.style()->setGridAutoFlow(autoFlow);
1447 } 1429 }
1448 1430
1449 } // namespace blink 1431 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698