Index: Source/core/css/resolver/StyleBuilderConverter.cpp |
diff --git a/Source/core/css/resolver/StyleBuilderConverter.cpp b/Source/core/css/resolver/StyleBuilderConverter.cpp |
index 54001e8d280f838f8e8dcf389b903618507e82ea..35c7bc90c70f4ebc91c2dedb74802f004087a7b7 100644 |
--- a/Source/core/css/resolver/StyleBuilderConverter.cpp |
+++ b/Source/core/css/resolver/StyleBuilderConverter.cpp |
@@ -64,7 +64,7 @@ static GridLength convertGridTrackBreadth(const StyleResolverState& state, CSSPr |
} // namespace |
-PassRefPtr<StyleReflection> StyleBuilderConverter::convertBoxReflect(StyleResolverState& state, CSSValue value) |
+PassRefPtr<StyleReflection> StyleBuilderConverter::convertBoxReflect(StyleResolverState& state, const CSSValue& value) |
{ |
if (value.isPrimitiveValue()) { |
ASSERT(toCSSPrimitiveValue(value).getValueID() == CSSValueNone); |
@@ -84,13 +84,13 @@ PassRefPtr<StyleReflection> StyleBuilderConverter::convertBoxReflect(StyleResolv |
return reflection.release(); |
} |
-Color StyleBuilderConverter::convertColor(StyleResolverState& state, CSSValue value, bool forVisitedLink) |
+Color StyleBuilderConverter::convertColor(StyleResolverState& state, const CSSValue& value, bool forVisitedLink) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
return state.document().textLinkColors().colorFromPrimitiveValue(primitiveValue, state.style()->color(), forVisitedLink); |
} |
-AtomicString StyleBuilderConverter::convertFragmentIdentifier(StyleResolverState& state, CSSValue value) |
+AtomicString StyleBuilderConverter::convertFragmentIdentifier(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
if (primitiveValue.isURI()) |
@@ -98,7 +98,7 @@ AtomicString StyleBuilderConverter::convertFragmentIdentifier(StyleResolverState |
return nullAtom; |
} |
-LengthBox StyleBuilderConverter::convertClip(StyleResolverState& state, CSSValue value) |
+LengthBox StyleBuilderConverter::convertClip(StyleResolverState& state, const CSSValue& value) |
{ |
Rect* rect = toCSSPrimitiveValue(value).getRectValue(); |
@@ -144,7 +144,7 @@ static bool convertFontFamilyName(StyleResolverState& state, CSSPrimitiveValue& |
return !familyName.isEmpty(); |
} |
-FontDescription::FamilyDescription StyleBuilderConverter::convertFontFamily(StyleResolverState& state, CSSValue value) |
+FontDescription::FamilyDescription StyleBuilderConverter::convertFontFamily(StyleResolverState& state, const CSSValue& value) |
{ |
ASSERT(value.isValueList()); |
@@ -175,7 +175,7 @@ FontDescription::FamilyDescription StyleBuilderConverter::convertFontFamily(Styl |
return desc; |
} |
-PassRefPtr<FontFeatureSettings> StyleBuilderConverter::convertFontFeatureSettings(StyleResolverState& state, CSSValue value) |
+PassRefPtr<FontFeatureSettings> StyleBuilderConverter::convertFontFeatureSettings(StyleResolverState& state, const CSSValue& value) |
{ |
if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() == CSSValueNormal) |
return FontBuilder::initialFeatureSettings(); |
@@ -207,7 +207,7 @@ static float computeFontSize(StyleResolverState& state, CSSPrimitiveValue& primi |
return 0; |
} |
-FontDescription::Size StyleBuilderConverter::convertFontSize(StyleResolverState& state, CSSValue value) |
+FontDescription::Size StyleBuilderConverter::convertFontSize(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
@@ -246,7 +246,7 @@ FontDescription::Size StyleBuilderConverter::convertFontSize(StyleResolverState& |
return FontDescription::Size(0, computeFontSize(state, primitiveValue, parentSize), parentIsAbsoluteSize || !primitiveValue.isFontRelativeLength()); |
} |
-float StyleBuilderConverter::convertFontSizeAdjust(StyleResolverState& state, CSSValue value) |
+float StyleBuilderConverter::convertFontSizeAdjust(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
if (primitiveValue.getValueID() == CSSValueNone) |
@@ -256,7 +256,7 @@ float StyleBuilderConverter::convertFontSizeAdjust(StyleResolverState& state, CS |
return primitiveValue.getFloatValue(); |
} |
-FontWeight StyleBuilderConverter::convertFontWeight(StyleResolverState& state, CSSValue value) |
+FontWeight StyleBuilderConverter::convertFontWeight(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
switch (primitiveValue.getValueID()) { |
@@ -269,7 +269,7 @@ FontWeight StyleBuilderConverter::convertFontWeight(StyleResolverState& state, C |
} |
} |
-FontDescription::VariantLigatures StyleBuilderConverter::convertFontVariantLigatures(StyleResolverState&, CSSValue value) |
+FontDescription::VariantLigatures StyleBuilderConverter::convertFontVariantLigatures(StyleResolverState&, const CSSValue& value) |
{ |
if (value.isValueList()) { |
FontDescription::VariantLigatures ligatures; |
@@ -315,7 +315,7 @@ FontDescription::VariantLigatures StyleBuilderConverter::convertFontVariantLigat |
return FontDescription::VariantLigatures(); |
} |
-EGlyphOrientation StyleBuilderConverter::convertGlyphOrientation(StyleResolverState&, CSSValue value) |
+EGlyphOrientation StyleBuilderConverter::convertGlyphOrientation(StyleResolverState&, const CSSValue& value) |
{ |
if (!value.isPrimitiveValue()) |
return GO_0DEG; |
@@ -335,7 +335,7 @@ EGlyphOrientation StyleBuilderConverter::convertGlyphOrientation(StyleResolverSt |
return GO_270DEG; |
} |
-StyleSelfAlignmentData StyleBuilderConverter::convertSelfOrDefaultAlignmentData(StyleResolverState&, CSSValue value) |
+StyleSelfAlignmentData StyleBuilderConverter::convertSelfOrDefaultAlignmentData(StyleResolverState&, const CSSValue& value) |
{ |
StyleSelfAlignmentData alignmentData = ComputedStyle::initialSelfAlignment(); |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
@@ -353,7 +353,7 @@ StyleSelfAlignmentData StyleBuilderConverter::convertSelfOrDefaultAlignmentData( |
return alignmentData; |
} |
-StyleContentAlignmentData StyleBuilderConverter::convertContentAlignmentData(StyleResolverState&, CSSValue value) |
+StyleContentAlignmentData StyleBuilderConverter::convertContentAlignmentData(StyleResolverState&, const CSSValue& value) |
{ |
StyleContentAlignmentData alignmentData = ComputedStyle::initialContentAlignment(); |
CSSContentDistributionValue& contentValue = toCSSContentDistributionValue(value); |
@@ -366,7 +366,7 @@ StyleContentAlignmentData StyleBuilderConverter::convertContentAlignmentData(Sty |
return alignmentData; |
} |
-GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, CSSValue value) |
+GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, const CSSValue& value) |
{ |
CSSValueList& list = toCSSValueList(value); |
@@ -393,7 +393,7 @@ GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, CSS |
} |
} |
-GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, CSSValue value) |
+GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, const CSSValue& value) |
{ |
// We accept the specification's grammar: |
// 'auto' | [ <integer> || <custom-ident> ] | [ span && [ <integer> || <custom-ident> ] ] | <custom-ident> |
@@ -449,7 +449,7 @@ GridPosition StyleBuilderConverter::convertGridPosition(StyleResolverState&, CSS |
return position; |
} |
-GridTrackSize StyleBuilderConverter::convertGridTrackSize(StyleResolverState& state, CSSValue value) |
+GridTrackSize StyleBuilderConverter::convertGridTrackSize(StyleResolverState& state, const CSSValue& value) |
{ |
if (value.isPrimitiveValue()) |
return GridTrackSize(convertGridTrackBreadth(state, &toCSSPrimitiveValue(value))); |
@@ -532,17 +532,17 @@ void StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(const Named |
} |
} |
-Length StyleBuilderConverter::convertLength(const StyleResolverState& state, CSSValue value) |
+Length StyleBuilderConverter::convertLength(const StyleResolverState& state, const CSSValue& value) |
{ |
return toCSSPrimitiveValue(value).convertToLength(state.cssToLengthConversionData()); |
} |
-UnzoomedLength StyleBuilderConverter::convertUnzoomedLength(const StyleResolverState& state, CSSValue value) |
+UnzoomedLength StyleBuilderConverter::convertUnzoomedLength(const StyleResolverState& state, const CSSValue& value) |
{ |
return UnzoomedLength(toCSSPrimitiveValue(value).convertToLength(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f))); |
} |
-Length StyleBuilderConverter::convertLengthOrAuto(const StyleResolverState& state, CSSValue value) |
+Length StyleBuilderConverter::convertLengthOrAuto(const StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
if (primitiveValue.getValueID() == CSSValueAuto) |
@@ -550,7 +550,7 @@ Length StyleBuilderConverter::convertLengthOrAuto(const StyleResolverState& stat |
return primitiveValue.convertToLength(state.cssToLengthConversionData()); |
} |
-Length StyleBuilderConverter::convertLengthSizing(StyleResolverState& state, CSSValue value) |
+Length StyleBuilderConverter::convertLengthSizing(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
switch (primitiveValue.getValueID()) { |
@@ -578,7 +578,7 @@ Length StyleBuilderConverter::convertLengthSizing(StyleResolverState& state, CSS |
} |
} |
-Length StyleBuilderConverter::convertLengthMaxSizing(StyleResolverState& state, CSSValue value) |
+Length StyleBuilderConverter::convertLengthMaxSizing(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
if (primitiveValue.getValueID() == CSSValueNone) |
@@ -586,7 +586,7 @@ Length StyleBuilderConverter::convertLengthMaxSizing(StyleResolverState& state, |
return convertLengthSizing(state, value); |
} |
-TabSize StyleBuilderConverter::convertLengthOrTabSpaces(StyleResolverState& state, CSSValue value) |
+TabSize StyleBuilderConverter::convertLengthOrTabSpaces(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
if (primitiveValue.isNumber()) |
@@ -594,7 +594,7 @@ TabSize StyleBuilderConverter::convertLengthOrTabSpaces(StyleResolverState& stat |
return TabSize(primitiveValue.computeLength<float>(state.cssToLengthConversionData())); |
} |
-LineBoxContain StyleBuilderConverter::convertLineBoxContain(StyleResolverState&, CSSValue value) |
+LineBoxContain StyleBuilderConverter::convertLineBoxContain(StyleResolverState&, const CSSValue& value) |
{ |
if (value.isPrimitiveValue()) { |
ASSERT(toCSSPrimitiveValue(value).getValueID() == CSSValueNone); |
@@ -612,7 +612,7 @@ static CSSToLengthConversionData lineHeightToLengthConversionData(StyleResolverS |
return state.cssToLengthConversionData().copyWithAdjustedZoom(multiplier); |
} |
-Length StyleBuilderConverter::convertLineHeight(StyleResolverState& state, CSSValue value) |
+Length StyleBuilderConverter::convertLineHeight(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
@@ -631,7 +631,7 @@ Length StyleBuilderConverter::convertLineHeight(StyleResolverState& state, CSSVa |
return ComputedStyle::initialLineHeight(); |
} |
-float StyleBuilderConverter::convertNumberOrPercentage(StyleResolverState& state, CSSValue value) |
+float StyleBuilderConverter::convertNumberOrPercentage(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
ASSERT(primitiveValue.isNumber() || primitiveValue.isPercentage()); |
@@ -654,7 +654,7 @@ static Length convertPositionLength(StyleResolverState& state, CSSPrimitiveValue |
return StyleBuilderConverter::convertLength(state, CSSValue(*primitiveValue)); |
} |
-LengthPoint StyleBuilderConverter::convertPosition(StyleResolverState& state, CSSValue value) |
+LengthPoint StyleBuilderConverter::convertPosition(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
Pair* pair = primitiveValue.getPairValue(); |
@@ -669,7 +669,7 @@ static float convertPerspectiveLength(StyleResolverState& state, CSSPrimitiveVal |
return std::max(primitiveValue.computeLength<float>(state.cssToLengthConversionData()), 0.0f); |
} |
-float StyleBuilderConverter::convertPerspective(StyleResolverState& state, CSSValue value) |
+float StyleBuilderConverter::convertPerspective(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
@@ -697,7 +697,7 @@ static Length convertOriginLength(StyleResolverState& state, CSSPrimitiveValue& |
return StyleBuilderConverter::convertLength(state, CSSValue(primitiveValue)); |
} |
-LengthPoint StyleBuilderConverter::convertPerspectiveOrigin(StyleResolverState& state, CSSValue value) |
+LengthPoint StyleBuilderConverter::convertPerspectiveOrigin(StyleResolverState& state, const CSSValue& value) |
{ |
CSSValueList& list = toCSSValueList(value); |
ASSERT(list.length() == 2); |
@@ -711,7 +711,7 @@ LengthPoint StyleBuilderConverter::convertPerspectiveOrigin(StyleResolverState& |
); |
} |
-EPaintOrder StyleBuilderConverter::convertPaintOrder(StyleResolverState&, CSSValue cssPaintOrder) |
+EPaintOrder StyleBuilderConverter::convertPaintOrder(StyleResolverState&, const CSSValue& cssPaintOrder) |
{ |
if (cssPaintOrder.isValueList()) { |
int paintOrder = 0; |
@@ -741,7 +741,7 @@ EPaintOrder StyleBuilderConverter::convertPaintOrder(StyleResolverState&, CSSVal |
return PO_NORMAL; |
} |
-Length StyleBuilderConverter::convertQuirkyLength(StyleResolverState& state, CSSValue value) |
+Length StyleBuilderConverter::convertQuirkyLength(StyleResolverState& state, const CSSValue& value) |
{ |
Length length = convertLengthOrAuto(state, value); |
// This is only for margins which use __qem |
@@ -749,7 +749,7 @@ Length StyleBuilderConverter::convertQuirkyLength(StyleResolverState& state, CSS |
return length; |
} |
-PassRefPtr<QuotesData> StyleBuilderConverter::convertQuotes(StyleResolverState&, CSSValue value) |
+PassRefPtr<QuotesData> StyleBuilderConverter::convertQuotes(StyleResolverState&, const CSSValue& value) |
{ |
if (value.isValueList()) { |
CSSValueList& list = toCSSValueList(value); |
@@ -767,7 +767,7 @@ PassRefPtr<QuotesData> StyleBuilderConverter::convertQuotes(StyleResolverState&, |
return QuotesData::create(); |
} |
-LengthSize StyleBuilderConverter::convertRadius(StyleResolverState& state, CSSValue value) |
+LengthSize StyleBuilderConverter::convertRadius(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
Pair* pair = primitiveValue.getPairValue(); |
@@ -781,7 +781,7 @@ LengthSize StyleBuilderConverter::convertRadius(StyleResolverState& state, CSSVa |
return LengthSize(radiusWidth, radiusHeight); |
} |
-PassRefPtr<ShadowList> StyleBuilderConverter::convertShadow(StyleResolverState& state, CSSValue value) |
+PassRefPtr<ShadowList> StyleBuilderConverter::convertShadow(StyleResolverState& state, const CSSValue& value) |
{ |
if (value.isPrimitiveValue()) { |
ASSERT(toCSSPrimitiveValue(value).getValueID() == CSSValueNone); |
@@ -800,13 +800,13 @@ PassRefPtr<ShadowList> StyleBuilderConverter::convertShadow(StyleResolverState& |
ShadowStyle shadowStyle = item.style && item.style->getValueID() == CSSValueInset ? Inset : Normal; |
StyleColor color = StyleColor::currentColor(); |
if (item.color) |
- color = convertStyleColor(state, CSSValue(*item.color)); |
+ color = convertStyleColor(state, CSSValue(item.color)); |
shadows.append(ShadowData(FloatPoint(x, y), blur, spread, shadowStyle, color)); |
} |
return ShadowList::adopt(shadows); |
} |
-PassRefPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(StyleResolverState& state, CSSValue value) |
+PassRefPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(StyleResolverState& state, const CSSValue& value) |
{ |
if (value.isPrimitiveValue()) { |
ASSERT(toCSSPrimitiveValue(value).getValueID() == CSSValueNone); |
@@ -834,7 +834,7 @@ PassRefPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(StyleResolverSta |
return ShapeValue::createBoxShapeValue(cssBox); |
} |
-float StyleBuilderConverter::convertSpacing(StyleResolverState& state, CSSValue value) |
+float StyleBuilderConverter::convertSpacing(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
if (primitiveValue.getValueID() == CSSValueNormal) |
@@ -842,7 +842,7 @@ float StyleBuilderConverter::convertSpacing(StyleResolverState& state, CSSValue |
return primitiveValue.computeLength<float>(state.cssToLengthConversionData()); |
} |
-PassRefPtr<SVGDashArray> StyleBuilderConverter::convertStrokeDasharray(StyleResolverState& state, CSSValue value) |
+PassRefPtr<SVGDashArray> StyleBuilderConverter::convertStrokeDasharray(StyleResolverState& state, const CSSValue& value) |
{ |
if (!value.isValueList()) |
return SVGComputedStyle::initialStrokeDashArray(); |
@@ -870,7 +870,7 @@ StyleColor StyleBuilderConverter::convertStyleColor(StyleResolverState& state, C |
return state.document().textLinkColors().colorFromPrimitiveValue(primitiveValue, Color(), forVisitedLink); |
} |
-float StyleBuilderConverter::convertTextStrokeWidth(StyleResolverState& state, CSSValue value) |
+float StyleBuilderConverter::convertTextStrokeWidth(StyleResolverState& state, const CSSValue& value) |
{ |
CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
if (primitiveValue.getValueID()) { |
@@ -880,7 +880,7 @@ float StyleBuilderConverter::convertTextStrokeWidth(StyleResolverState& state, C |
return primitiveValue.computeLength<float>(state.cssToLengthConversionData()); |
} |
-TransformOrigin StyleBuilderConverter::convertTransformOrigin(StyleResolverState& state, CSSValue value) |
+TransformOrigin StyleBuilderConverter::convertTransformOrigin(StyleResolverState& state, const CSSValue& value) |
{ |
CSSValueList& list = toCSSValueList(value); |
ASSERT(list.length() == 3); |
@@ -895,7 +895,7 @@ TransformOrigin StyleBuilderConverter::convertTransformOrigin(StyleResolverState |
); |
} |
-ScrollSnapPoints StyleBuilderConverter::convertSnapPoints(StyleResolverState& state, CSSValue value) |
+ScrollSnapPoints StyleBuilderConverter::convertSnapPoints(StyleResolverState& state, const CSSValue& value) |
{ |
// Handles: none | repeat(<length>) |
ScrollSnapPoints points; |
@@ -912,7 +912,7 @@ ScrollSnapPoints StyleBuilderConverter::convertSnapPoints(StyleResolverState& st |
return points; |
} |
-Vector<LengthPoint> StyleBuilderConverter::convertSnapCoordinates(StyleResolverState& state, CSSValue value) |
+Vector<LengthPoint> StyleBuilderConverter::convertSnapCoordinates(StyleResolverState& state, const CSSValue& value) |
{ |
// Handles: none | <position># |
Vector<LengthPoint> coordinates; |
@@ -929,7 +929,7 @@ Vector<LengthPoint> StyleBuilderConverter::convertSnapCoordinates(StyleResolverS |
return coordinates; |
} |
-PassRefPtr<TranslateTransformOperation> StyleBuilderConverter::convertTranslate(StyleResolverState& state, CSSValue value) |
+PassRefPtr<TranslateTransformOperation> StyleBuilderConverter::convertTranslate(StyleResolverState& state, const CSSValue& value) |
{ |
CSSValueList& list = toCSSValueList(value); |
ASSERT(list.length() <= 3); |
@@ -944,7 +944,7 @@ PassRefPtr<TranslateTransformOperation> StyleBuilderConverter::convertTranslate( |
return TranslateTransformOperation::create(tx, ty, tz, TransformOperation::Translate3D); |
} |
-PassRefPtr<RotateTransformOperation> StyleBuilderConverter::convertRotate(StyleResolverState& state, CSSValue value) |
+PassRefPtr<RotateTransformOperation> StyleBuilderConverter::convertRotate(StyleResolverState& state, const CSSValue& value) |
{ |
CSSValueList& list = toCSSValueList(value); |
ASSERT(list.length() == 1 || list.length() == 4); |
@@ -961,7 +961,7 @@ PassRefPtr<RotateTransformOperation> StyleBuilderConverter::convertRotate(StyleR |
return RotateTransformOperation::create(x, y, z, angle, TransformOperation::Rotate3D); |
} |
-PassRefPtr<ScaleTransformOperation> StyleBuilderConverter::convertScale(StyleResolverState& state, CSSValue value) |
+PassRefPtr<ScaleTransformOperation> StyleBuilderConverter::convertScale(StyleResolverState& state, const CSSValue& value) |
{ |
CSSValueList& list = toCSSValueList(value); |
ASSERT(list.length() <= 3); |