Index: Source/core/css/ComputedStyleCSSValueMapping.cpp |
diff --git a/Source/core/css/ComputedStyleCSSValueMapping.cpp b/Source/core/css/ComputedStyleCSSValueMapping.cpp |
index dc0010acc1829e15be8fab716e7ffd0d6e67175f..96135bcc42cf3bd1aa105f188b60635924cd0999 100644 |
--- a/Source/core/css/ComputedStyleCSSValueMapping.cpp |
+++ b/Source/core/css/ComputedStyleCSSValueMapping.cpp |
@@ -147,9 +147,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForFillSourceType(EMaskSourceType t |
{ |
switch (type) { |
case MaskAlpha: |
- return cssValuePool().createValue(CSSValueAlpha); |
+ return cssValuePool().createIdentifierValue(CSSValueAlpha); |
case MaskLuminance: |
- return cssValuePool().createValue(CSSValueLuminance); |
+ return cssValuePool().createIdentifierValue(CSSValueLuminance); |
} |
ASSERT_NOT_REACHED(); |
@@ -394,7 +394,7 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valueForItemPositionWithOverflowAlig |
{ |
RefPtrWillBeRawPtr<CSSValueList> result = CSSValueList::createSpaceSeparated(); |
if (positionType == LegacyPosition) |
- result->append(CSSPrimitiveValue::createIdentifier(CSSValueLegacy)); |
+ result->append(CSSPrimitiveValue::create(CSSValueLegacy)); |
result->append(CSSPrimitiveValue::create(itemPosition)); |
if (itemPosition >= ItemPositionCenter && overflowAlignment != OverflowAlignmentDefault) |
result->append(CSSPrimitiveValue::create(overflowAlignment)); |
@@ -1176,7 +1176,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> glyphOrientationToCSSPrimitiveV |
static PassRefPtrWillBeRawPtr<CSSValue> strokeDashArrayToCSSValueList(const SVGDashArray& dashes, const ComputedStyle& style) |
{ |
if (dashes.isEmpty()) |
- return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
+ return CSSPrimitiveValue::create(CSSValueNone); |
RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); |
for (const Length& dashLength : dashes.vector()) |
@@ -1754,7 +1754,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID |
return CSSPrimitiveValue::create(style.imageRendering()); |
case CSSPropertyImageOrientation: |
if (style.respectImageOrientation() == RespectImageOrientation) |
- return cssValuePool().createValue(CSSValueFromImage); |
+ return cssValuePool().createIdentifierValue(CSSValueFromImage); |
return cssValuePool().createValue(0, CSSPrimitiveValue::CSS_DEG); |
case CSSPropertyIsolation: |
return cssValuePool().createValue(style.isolation()); |
@@ -2562,15 +2562,15 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID |
case CSSPropertyClipPath: |
if (!svgStyle.clipperResource().isEmpty()) |
return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.clipperResource()), CSSPrimitiveValue::CSS_URI); |
- return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
+ return CSSPrimitiveValue::create(CSSValueNone); |
case CSSPropertyMask: |
if (!svgStyle.maskerResource().isEmpty()) |
return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.maskerResource()), CSSPrimitiveValue::CSS_URI); |
- return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
+ return CSSPrimitiveValue::create(CSSValueNone); |
case CSSPropertyFilter: |
if (!svgStyle.filterResource().isEmpty()) |
return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.filterResource()), CSSPrimitiveValue::CSS_URI); |
- return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
+ return CSSPrimitiveValue::create(CSSValueNone); |
case CSSPropertyFloodColor: |
return currentColorOrValidColor(style, svgStyle.floodColor()); |
case CSSPropertyLightingColor: |
@@ -2582,15 +2582,15 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID |
case CSSPropertyMarkerEnd: |
if (!svgStyle.markerEndResource().isEmpty()) |
return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.markerEndResource()), CSSPrimitiveValue::CSS_URI); |
- return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
+ return CSSPrimitiveValue::create(CSSValueNone); |
case CSSPropertyMarkerMid: |
if (!svgStyle.markerMidResource().isEmpty()) |
return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.markerMidResource()), CSSPrimitiveValue::CSS_URI); |
- return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
+ return CSSPrimitiveValue::create(CSSValueNone); |
case CSSPropertyMarkerStart: |
if (!svgStyle.markerStartResource().isEmpty()) |
return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.markerStartResource()), CSSPrimitiveValue::CSS_URI); |
- return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
+ return CSSPrimitiveValue::create(CSSValueNone); |
case CSSPropertyStroke: |
return adjustSVGPaintForCurrentColor(svgStyle.strokePaintType(), svgStyle.strokePaintUri(), svgStyle.strokePaintColor(), style.color()); |
case CSSPropertyStrokeDasharray: |
@@ -2602,9 +2602,9 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID |
case CSSPropertyBaselineShift: { |
switch (svgStyle.baselineShift()) { |
case BS_SUPER: |
- return CSSPrimitiveValue::createIdentifier(CSSValueSuper); |
+ return CSSPrimitiveValue::create(CSSValueSuper); |
case BS_SUB: |
- return CSSPrimitiveValue::createIdentifier(CSSValueSub); |
+ return CSSPrimitiveValue::create(CSSValueSub); |
case BS_LENGTH: |
return zoomAdjustedPixelValueForLength(svgStyle.baselineShiftValue(), style); |
} |
@@ -2619,7 +2619,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID |
if (RefPtrWillBeRawPtr<CSSPrimitiveValue> value = glyphOrientationToCSSPrimitiveValue(svgStyle.glyphOrientationVertical())) |
return value.release(); |
if (svgStyle.glyphOrientationVertical() == GO_AUTO) |
- return CSSPrimitiveValue::createIdentifier(CSSValueAuto); |
+ return CSSPrimitiveValue::create(CSSValueAuto); |
return nullptr; |
} |
case CSSPropertyPaintOrder: |