Source/core/css/resolver/StyleBuilderConverter.h - Issue 680063005: [CSS Grid Layout] Redefining grids inside media queries does not work

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

Issue 680063005: [CSS Grid Layout] Redefining grids inside media queries does not work (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 1 month 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 | « LayoutTests/fast/css-grid-layout/named-grid-areas-dynamic-with-media-query-expected.html ('k') | Source/core/css/resolver/StyleBuilderConverter.cpp » ('j') | Source/core/css/resolver/StyleBuilderConverter.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 template <CSSValueID IdForNone> static AtomicString convertString(StyleResol verState&, CSSValue*);	78 template <CSSValueID IdForNone> static AtomicString convertString(StyleResol verState&, CSSValue*);

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

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

81 static Color convertSVGColor(StyleResolverState&, CSSValue*);	81 static Color convertSVGColor(StyleResolverState&, CSSValue*);

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

83 static float convertTextStrokeWidth(StyleResolverState&, CSSValue*);	83 static float convertTextStrokeWidth(StyleResolverState&, CSSValue*);

84 static TransformOrigin convertTransformOrigin(StyleResolverState&, CSSValue* );	84 static TransformOrigin convertTransformOrigin(StyleResolverState&, CSSValue* );

85	85

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

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

	88 static void convertOrderedNamedGridLinesMapToNamedGridLinesMap(const Ordered NamedGridLines&, NamedGridLinesMap&);

88 };	89 };

89	90

90 template <typename T>	91 template <typename T>

91 T StyleBuilderConverter::convertComputedLength(StyleResolverState& state, CSSVal ue* value)	92 T StyleBuilderConverter::convertComputedLength(StyleResolverState& state, CSSVal ue* value)

92 {	93 {

93 return toCSSPrimitiveValue(value)->computeLength<T>(state.cssToLengthConvers ionData());	94 return toCSSPrimitiveValue(value)->computeLength<T>(state.cssToLengthConvers ionData());

94 }	95 }

95	96

96 template <typename T>	97 template <typename T>

97 T StyleBuilderConverter::convertFlags(StyleResolverState& state, CSSValue* value )	98 T StyleBuilderConverter::convertFlags(StyleResolverState& state, CSSValue* value )

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135 {	136 {

136 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);	137 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);

137 if (primitiveValue->getValueID() == IdForNone)	138 if (primitiveValue->getValueID() == IdForNone)

138 return nullAtom;	139 return nullAtom;

139 return AtomicString(primitiveValue->getStringValue());	140 return AtomicString(primitiveValue->getStringValue());

140 }	141 }

141	142

142 } // namespace blink	143 } // namespace blink

143	144

144 #endif	145 #endif

OLD	NEW