Index: Source/core/css/resolver/StyleBuilderConverter.h |
diff --git a/Source/core/css/resolver/StyleBuilderConverter.h b/Source/core/css/resolver/StyleBuilderConverter.h |
index 4664ee263fce6e0ac9b6e2ffe6156c96314f410f..3290207939e3df0becf9c77b44fbddc7a4460475 100644 |
--- a/Source/core/css/resolver/StyleBuilderConverter.h |
+++ b/Source/core/css/resolver/StyleBuilderConverter.h |
@@ -49,84 +49,84 @@ class ScaleTransformOperation; |
// Note that we assume the parser only allows valid CSSValue types. |
class StyleBuilderConverter { |
public: |
- static PassRefPtr<StyleReflection> convertBoxReflect(StyleResolverState&, CSSValue*); |
- static AtomicString convertFragmentIdentifier(StyleResolverState&, CSSValue*); |
- static Color convertColor(StyleResolverState&, CSSValue*, bool forVisitedLink = false); |
- template <typename T> static T convertComputedLength(StyleResolverState&, CSSValue*); |
- static LengthBox convertClip(StyleResolverState&, CSSValue*); |
- template <typename T> static T convertFlags(StyleResolverState&, CSSValue*); |
- static FontDescription::FamilyDescription convertFontFamily(StyleResolverState&, CSSValue*); |
- static PassRefPtr<FontFeatureSettings> convertFontFeatureSettings(StyleResolverState&, CSSValue*); |
- static FontDescription::Size convertFontSize(StyleResolverState&, CSSValue*); |
- static float convertFontSizeAdjust(StyleResolverState&, CSSValue*); |
- static FontWeight convertFontWeight(StyleResolverState&, CSSValue*); |
- static FontDescription::VariantLigatures convertFontVariantLigatures(StyleResolverState&, CSSValue*); |
- static EGlyphOrientation convertGlyphOrientation(StyleResolverState&, CSSValue*); |
- static StyleSelfAlignmentData convertSelfOrDefaultAlignmentData(StyleResolverState&, CSSValue*); |
- static StyleContentAlignmentData convertContentAlignmentData(StyleResolverState&, CSSValue*); |
- static GridAutoFlow convertGridAutoFlow(StyleResolverState&, CSSValue*); |
- static GridPosition convertGridPosition(StyleResolverState&, CSSValue*); |
- static GridTrackSize convertGridTrackSize(StyleResolverState&, CSSValue*); |
- template <typename T> static T convertLineWidth(StyleResolverState&, CSSValue*); |
- static Length convertLength(const StyleResolverState&, CSSValue*); |
- static UnzoomedLength convertUnzoomedLength(const StyleResolverState&, CSSValue*); |
- static Length convertLengthOrAuto(const StyleResolverState&, CSSValue*); |
- static Length convertLengthSizing(StyleResolverState&, CSSValue*); |
- static Length convertLengthMaxSizing(StyleResolverState&, CSSValue*); |
- static TabSize convertLengthOrTabSpaces(StyleResolverState&, CSSValue*); |
- static LineBoxContain convertLineBoxContain(StyleResolverState&, CSSValue*); |
- static Length convertLineHeight(StyleResolverState&, CSSValue*); |
- static float convertNumberOrPercentage(StyleResolverState&, CSSValue*); |
- static LengthPoint convertPosition(StyleResolverState&, CSSValue*); |
- static float convertPerspective(StyleResolverState&, CSSValue*); |
- static LengthPoint convertPerspectiveOrigin(StyleResolverState&, CSSValue*); |
- static Length convertQuirkyLength(StyleResolverState&, CSSValue*); |
- static PassRefPtr<QuotesData> convertQuotes(StyleResolverState&, CSSValue*); |
- static LengthSize convertRadius(StyleResolverState&, CSSValue*); |
- static EPaintOrder convertPaintOrder(StyleResolverState&, CSSValue*); |
- static PassRefPtr<ShadowList> convertShadow(StyleResolverState&, CSSValue*); |
- static PassRefPtr<ShapeValue> convertShapeValue(StyleResolverState&, CSSValue*); |
- static float convertSpacing(StyleResolverState&, CSSValue*); |
- template <CSSValueID IdForNone> static AtomicString convertString(StyleResolverState&, CSSValue*); |
- static PassRefPtr<SVGDashArray> convertStrokeDasharray(StyleResolverState&, CSSValue*); |
- static StyleColor convertStyleColor(StyleResolverState&, CSSValue*, bool forVisitedLink = false); |
- static float convertTextStrokeWidth(StyleResolverState&, CSSValue*); |
- static TransformOrigin convertTransformOrigin(StyleResolverState&, CSSValue*); |
+ static PassRefPtr<StyleReflection> convertBoxReflect(StyleResolverState&, CSSValue); |
+ static AtomicString convertFragmentIdentifier(StyleResolverState&, CSSValue); |
+ static Color convertColor(StyleResolverState&, CSSValue, bool forVisitedLink = false); |
+ template <typename T> static T convertComputedLength(StyleResolverState&, CSSValue); |
+ static LengthBox convertClip(StyleResolverState&, CSSValue); |
+ template <typename T> static T convertFlags(StyleResolverState&, CSSValue); |
+ static FontDescription::FamilyDescription convertFontFamily(StyleResolverState&, CSSValue); |
+ static PassRefPtr<FontFeatureSettings> convertFontFeatureSettings(StyleResolverState&, CSSValue); |
+ static FontDescription::Size convertFontSize(StyleResolverState&, CSSValue); |
+ static float convertFontSizeAdjust(StyleResolverState&, CSSValue); |
+ static FontWeight convertFontWeight(StyleResolverState&, CSSValue); |
+ static FontDescription::VariantLigatures convertFontVariantLigatures(StyleResolverState&, CSSValue); |
+ static EGlyphOrientation convertGlyphOrientation(StyleResolverState&, CSSValue); |
+ static StyleSelfAlignmentData convertSelfOrDefaultAlignmentData(StyleResolverState&, CSSValue); |
+ static StyleContentAlignmentData convertContentAlignmentData(StyleResolverState&, CSSValue); |
+ static GridAutoFlow convertGridAutoFlow(StyleResolverState&, CSSValue); |
+ static GridPosition convertGridPosition(StyleResolverState&, CSSValue); |
+ static GridTrackSize convertGridTrackSize(StyleResolverState&, CSSValue); |
+ template <typename T> static T convertLineWidth(StyleResolverState&, CSSValue); |
+ static Length convertLength(const StyleResolverState&, CSSValue); |
+ static UnzoomedLength convertUnzoomedLength(const StyleResolverState&, CSSValue); |
+ static Length convertLengthOrAuto(const StyleResolverState&, CSSValue); |
+ static Length convertLengthSizing(StyleResolverState&, CSSValue); |
+ static Length convertLengthMaxSizing(StyleResolverState&, CSSValue); |
+ static TabSize convertLengthOrTabSpaces(StyleResolverState&, CSSValue); |
+ static LineBoxContain convertLineBoxContain(StyleResolverState&, CSSValue); |
+ static Length convertLineHeight(StyleResolverState&, CSSValue); |
+ static float convertNumberOrPercentage(StyleResolverState&, CSSValue); |
+ static LengthPoint convertPosition(StyleResolverState&, CSSValue); |
+ static float convertPerspective(StyleResolverState&, CSSValue); |
+ static LengthPoint convertPerspectiveOrigin(StyleResolverState&, CSSValue); |
+ static Length convertQuirkyLength(StyleResolverState&, CSSValue); |
+ static PassRefPtr<QuotesData> convertQuotes(StyleResolverState&, CSSValue); |
+ static LengthSize convertRadius(StyleResolverState&, CSSValue); |
+ static EPaintOrder convertPaintOrder(StyleResolverState&, CSSValue); |
+ static PassRefPtr<ShadowList> convertShadow(StyleResolverState&, CSSValue); |
+ static PassRefPtr<ShapeValue> convertShapeValue(StyleResolverState&, CSSValue); |
+ static float convertSpacing(StyleResolverState&, CSSValue); |
+ template <CSSValueID IdForNone> static AtomicString convertString(StyleResolverState&, CSSValue); |
+ static PassRefPtr<SVGDashArray> convertStrokeDasharray(StyleResolverState&, CSSValue); |
+ static StyleColor convertStyleColor(StyleResolverState&, CSSValue, bool forVisitedLink = false); |
+ static float convertTextStrokeWidth(StyleResolverState&, CSSValue); |
+ static TransformOrigin convertTransformOrigin(StyleResolverState&, CSSValue); |
- static bool convertGridTrackList(CSSValue*, Vector<GridTrackSize>&, NamedGridLinesMap&, OrderedNamedGridLines&, StyleResolverState&); |
+ static bool convertGridTrackList(CSSValue, Vector<GridTrackSize>&, NamedGridLinesMap&, OrderedNamedGridLines&, StyleResolverState&); |
static void createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap&, NamedGridLinesMap&, GridTrackSizingDirection); |
static void convertOrderedNamedGridLinesMapToNamedGridLinesMap(const OrderedNamedGridLines&, NamedGridLinesMap&); |
- static ScrollSnapPoints convertSnapPoints(StyleResolverState&, CSSValue*); |
- static Vector<LengthPoint> convertSnapCoordinates(StyleResolverState&, CSSValue*); |
- static LengthPoint convertSnapDestination(StyleResolverState&, CSSValue*); |
- static PassRefPtr<TranslateTransformOperation> convertTranslate(StyleResolverState&, CSSValue*); |
- static PassRefPtr<RotateTransformOperation> convertRotate(StyleResolverState&, CSSValue*); |
- static PassRefPtr<ScaleTransformOperation> convertScale(StyleResolverState&, CSSValue*); |
+ static ScrollSnapPoints convertSnapPoints(StyleResolverState&, CSSValue); |
+ static Vector<LengthPoint> convertSnapCoordinates(StyleResolverState&, CSSValue); |
+ static LengthPoint convertSnapDestination(StyleResolverState&, CSSValue); |
+ static PassRefPtr<TranslateTransformOperation> convertTranslate(StyleResolverState&, CSSValue); |
+ static PassRefPtr<RotateTransformOperation> convertRotate(StyleResolverState&, CSSValue); |
+ static PassRefPtr<ScaleTransformOperation> convertScale(StyleResolverState&, CSSValue); |
}; |
template <typename T> |
-T StyleBuilderConverter::convertComputedLength(StyleResolverState& state, CSSValue* value) |
+T StyleBuilderConverter::convertComputedLength(StyleResolverState& state, CSSValue value) |
{ |
- return toCSSPrimitiveValue(value)->computeLength<T>(state.cssToLengthConversionData()); |
+ return toCSSPrimitiveValue(value).computeLength<T>(state.cssToLengthConversionData()); |
} |
template <typename T> |
-T StyleBuilderConverter::convertFlags(StyleResolverState& state, CSSValue* value) |
+T StyleBuilderConverter::convertFlags(StyleResolverState& state, CSSValue value) |
{ |
T flags = static_cast<T>(0); |
- if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->getValueID() == CSSValueNone) |
+ if (value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() == CSSValueNone) |
return flags; |
- for (auto& flagValue : toCSSValueList(*value)) |
- flags |= toCSSPrimitiveValue(*flagValue); |
+ for (auto& flagValue : toCSSValueList(value)) |
+ flags |= toCSSPrimitiveValue(flagValue); |
return flags; |
} |
template <typename T> |
-T StyleBuilderConverter::convertLineWidth(StyleResolverState& state, CSSValue* value) |
+T StyleBuilderConverter::convertLineWidth(StyleResolverState& state, CSSValue value) |
{ |
- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
- CSSValueID valueID = primitiveValue->getValueID(); |
+ CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
+ CSSValueID valueID = primitiveValue.getValueID(); |
if (valueID == CSSValueThin) |
return 1; |
if (valueID == CSSValueMedium) |
@@ -136,9 +136,9 @@ T StyleBuilderConverter::convertLineWidth(StyleResolverState& state, CSSValue* v |
if (valueID == CSSValueInvalid) { |
// Any original result that was >= 1 should not be allowed to fall below 1. |
// This keeps border lines from vanishing. |
- T result = primitiveValue->computeLength<T>(state.cssToLengthConversionData()); |
+ T result = primitiveValue.computeLength<T>(state.cssToLengthConversionData()); |
if (state.style()->effectiveZoom() < 1.0f && result < 1.0) { |
- T originalLength = primitiveValue->computeLength<T>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0)); |
+ T originalLength = primitiveValue.computeLength<T>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0)); |
if (originalLength >= 1.0) |
return 1.0; |
} |
@@ -149,12 +149,12 @@ T StyleBuilderConverter::convertLineWidth(StyleResolverState& state, CSSValue* v |
} |
template <CSSValueID IdForNone> |
-AtomicString StyleBuilderConverter::convertString(StyleResolverState&, CSSValue* value) |
+AtomicString StyleBuilderConverter::convertString(StyleResolverState&, CSSValue value) |
{ |
- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
- if (primitiveValue->getValueID() == IdForNone) |
+ CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); |
+ if (primitiveValue.getValueID() == IdForNone) |
return nullAtom; |
- return AtomicString(primitiveValue->getStringValue()); |
+ return AtomicString(primitiveValue.getStringValue()); |
} |
} // namespace blink |