Source/core/css/resolver/StyleBuilderConverter.h - Issue 547273002: Make currentColor behave the same internally as initial

Side by Side Diff: Source/core/css/resolver/StyleBuilderConverter.h

Issue 547273002: Make currentColor behave the same internally as initial (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 3 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/resolver/MatchedPropertiesCache.cpp ('k') | Source/core/css/resolver/StyleBuilderConverter.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * * Redistributions of source code must retain the above copyright	4 * * Redistributions of source code must retain the above copyright

5 * notice, this list of conditions and the following disclaimer.	5 * notice, this list of conditions and the following disclaimer.

6 * * Redistributions in binary form must reproduce the above	6 * * Redistributions in binary form must reproduce the above

7 * copyright notice, this list of conditions and the following disclaimer	7 * copyright notice, this list of conditions and the following disclaimer

8 * in the documentation and/or other materials provided with the	8 * in the documentation and/or other materials provided with the

9 * distribution.	9 * distribution.

10 * * Neither the name of Google Inc. nor the names of its	10 * * Neither the name of Google Inc. nor the names of its

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 static LengthPoint convertLengthPoint(StyleResolverState&, CSSValue*);	63 static LengthPoint convertLengthPoint(StyleResolverState&, CSSValue*);

64 static LineBoxContain convertLineBoxContain(StyleResolverState&, CSSValue*);	64 static LineBoxContain convertLineBoxContain(StyleResolverState&, CSSValue*);

65 static float convertNumberOrPercentage(StyleResolverState&, CSSValue*);	65 static float convertNumberOrPercentage(StyleResolverState&, CSSValue*);

66 static PassRefPtr<QuotesData> convertQuotes(StyleResolverState&, CSSValue*);	66 static PassRefPtr<QuotesData> convertQuotes(StyleResolverState&, CSSValue*);

67 static LengthSize convertRadius(StyleResolverState&, CSSValue*);	67 static LengthSize convertRadius(StyleResolverState&, CSSValue*);

68 static EPaintOrder convertPaintOrder(StyleResolverState&, CSSValue*);	68 static EPaintOrder convertPaintOrder(StyleResolverState&, CSSValue*);

69 static PassRefPtr<ShadowList> convertShadow(StyleResolverState&, CSSValue*);	69 static PassRefPtr<ShadowList> convertShadow(StyleResolverState&, CSSValue*);

70 static float convertSpacing(StyleResolverState&, CSSValue*);	70 static float convertSpacing(StyleResolverState&, CSSValue*);

71 template <CSSValueID IdForNone> static AtomicString convertString(StyleResol verState&, CSSValue*);	71 template <CSSValueID IdForNone> static AtomicString convertString(StyleResol verState&, CSSValue*);

72 static PassRefPtr<SVGLengthList> convertStrokeDasharray(StyleResolverState&, CSSValue*);	72 static PassRefPtr<SVGLengthList> convertStrokeDasharray(StyleResolverState&, CSSValue*);

	73 static StyleColor convertStyleColor(StyleResolverState&, CSSValue*, bool for VisitedLink = false);

73 static Color convertSVGColor(StyleResolverState&, CSSValue*);	74 static Color convertSVGColor(StyleResolverState&, CSSValue*);

74 static PassRefPtr<SVGLength> convertSVGLength(StyleResolverState&, CSSValue* );	75 static PassRefPtr<SVGLength> convertSVGLength(StyleResolverState&, CSSValue* );

75 static float convertTextStrokeWidth(StyleResolverState&, CSSValue*);	76 static float convertTextStrokeWidth(StyleResolverState&, CSSValue*);

76	77

77 static bool convertGridTrackList(CSSValue*, Vector<GridTrackSize>&, NamedGri dLinesMap&, OrderedNamedGridLines&, StyleResolverState&);	78 static bool convertGridTrackList(CSSValue*, Vector<GridTrackSize>&, NamedGri dLinesMap&, OrderedNamedGridLines&, StyleResolverState&);

78 static void createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& , NamedGridLinesMap&, GridTrackSizingDirection);	79 static void createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& , NamedGridLinesMap&, GridTrackSizingDirection);

79 };	80 };

80	81

81 template <typename T>	82 template <typename T>

82 T StyleBuilderConverter::convertComputedLength(StyleResolverState& state, CSSVal ue* value)	83 T StyleBuilderConverter::convertComputedLength(StyleResolverState& state, CSSVal ue* value)

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124 {	125 {

125 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);	126 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);

126 if (primitiveValue->getValueID() == IdForNone)	127 if (primitiveValue->getValueID() == IdForNone)

127 return nullAtom;	128 return nullAtom;

128 return AtomicString(primitiveValue->getStringValue());	129 return AtomicString(primitiveValue->getStringValue());

129 }	130 }

130	131

131 } // namespace blink	132 } // namespace blink

132	133

133 #endif	134 #endif

OLD	NEW