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

Side by Side Diff: sky/engine/core/css/resolver/StyleBuilderCustom.cpp

Issue 1069403003: Remove CSS list-style (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 8 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 lineHeight = Length(primitiveValue->getDoubleValue() * 100.0, Percent); 167 lineHeight = Length(primitiveValue->getDoubleValue() * 100.0, Percent);
168 } else if (primitiveValue->isCalculated()) { 168 } else if (primitiveValue->isCalculated()) {
169 Length length = Length(primitiveValue->cssCalcValue()->toCalcValue(state .cssToLengthConversionData())); 169 Length length = Length(primitiveValue->cssCalcValue()->toCalcValue(state .cssToLengthConversionData()));
170 lineHeight = Length(valueForLength(length, state.style()->fontSize()), F ixed); 170 lineHeight = Length(valueForLength(length, state.style()->fontSize()), F ixed);
171 } else { 171 } else {
172 return; 172 return;
173 } 173 }
174 state.style()->setLineHeight(lineHeight); 174 state.style()->setLineHeight(lineHeight);
175 } 175 }
176 176
177 void StyleBuilderFunctions::applyValueCSSPropertyListStyleImage(StyleResolverSta te& state, CSSValue* value)
178 {
179 state.style()->setListStyleImage(state.styleImage(CSSPropertyListStyleImage, value));
180 }
181
182 void StyleBuilderFunctions::applyInitialCSSPropertyOutlineStyle(StyleResolverSta te& state) 177 void StyleBuilderFunctions::applyInitialCSSPropertyOutlineStyle(StyleResolverSta te& state)
183 { 178 {
184 state.style()->setOutlineStyleIsAuto(RenderStyle::initialOutlineStyleIsAuto( )); 179 state.style()->setOutlineStyleIsAuto(RenderStyle::initialOutlineStyleIsAuto( ));
185 state.style()->setOutlineStyle(RenderStyle::initialBorderStyle()); 180 state.style()->setOutlineStyle(RenderStyle::initialBorderStyle());
186 } 181 }
187 182
188 void StyleBuilderFunctions::applyInheritCSSPropertyOutlineStyle(StyleResolverSta te& state) 183 void StyleBuilderFunctions::applyInheritCSSPropertyOutlineStyle(StyleResolverSta te& state)
189 { 184 {
190 state.style()->setOutlineStyleIsAuto(state.parentStyle()->outlineStyleIsAuto ()); 185 state.style()->setOutlineStyleIsAuto(state.parentStyle()->outlineStyleIsAuto ());
191 state.style()->setOutlineStyle(state.parentStyle()->outlineStyle()); 186 state.style()->setOutlineStyle(state.parentStyle()->outlineStyle());
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 state.style()->setPerspective(perspectiveValue); 784 state.style()->setPerspective(perspectiveValue);
790 } 785 }
791 786
792 void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextOrientation(StyleReso lverState& state, CSSValue* value) 787 void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextOrientation(StyleReso lverState& state, CSSValue* value)
793 { 788 {
794 if (value->isPrimitiveValue()) 789 if (value->isPrimitiveValue())
795 state.setTextOrientation(*toCSSPrimitiveValue(value)); 790 state.setTextOrientation(*toCSSPrimitiveValue(value));
796 } 791 }
797 792
798 } // namespace blink 793 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | sky/engine/core/css/resolver/StyleResourceLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698