Index: third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp |
diff --git a/third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp b/third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp |
index 1008e9dd33fbbf3223e6227226446fd093d03db1..3644286073bb336c8c30434032f374f1ea2292c0 100644 |
--- a/third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp |
+++ b/third_party/WebKit/Source/core/css/CSSBasicShapeValues.cpp |
@@ -68,15 +68,15 @@ static String serializePositionOffset(const CSSValuePair& offset, const CSSValue |
return offset.cssText(); |
} |
-static RawPtr<CSSValuePair> buildSerializablePositionOffset(RawPtr<CSSValue> offset, CSSValueID defaultSide) |
+static CSSValuePair* buildSerializablePositionOffset(CSSValue* offset, CSSValueID defaultSide) |
{ |
CSSValueID side = defaultSide; |
- RawPtr<CSSPrimitiveValue> amount = nullptr; |
+ CSSPrimitiveValue* amount = nullptr; |
if (!offset) { |
side = CSSValueCenter; |
- } else if (offset->isPrimitiveValue() && toCSSPrimitiveValue(offset.get())->isValueID()) { |
- side = toCSSPrimitiveValue(offset.get())->getValueID(); |
+ } else if (offset->isPrimitiveValue() && toCSSPrimitiveValue(offset)->isValueID()) { |
+ side = toCSSPrimitiveValue(offset)->getValueID(); |
} else if (offset->isValuePair()) { |
side = toCSSPrimitiveValue(toCSSValuePair(*offset).first()).getValueID(); |
amount = &toCSSPrimitiveValue(toCSSValuePair(*offset).second()); |
@@ -85,7 +85,7 @@ static RawPtr<CSSValuePair> buildSerializablePositionOffset(RawPtr<CSSValue> off |
amount = cssValuePool().createValue(100 - amount->getFloatValue(), CSSPrimitiveValue::UnitType::Percentage); |
} |
} else { |
- amount = toCSSPrimitiveValue(offset.get()); |
+ amount = toCSSPrimitiveValue(offset); |
} |
if (side == CSSValueCenter) { |
@@ -99,13 +99,13 @@ static RawPtr<CSSValuePair> buildSerializablePositionOffset(RawPtr<CSSValue> off |
side = defaultSide; |
} |
- return CSSValuePair::create(cssValuePool().createIdentifierValue(side), amount.release(), CSSValuePair::KeepIdenticalValues); |
+ return CSSValuePair::create(cssValuePool().createIdentifierValue(side), amount, CSSValuePair::KeepIdenticalValues); |
} |
String CSSBasicShapeCircleValue::customCSSText() const |
{ |
- RawPtr<CSSValuePair> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft); |
- RawPtr<CSSValuePair> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop); |
+ CSSValuePair* normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft); |
+ CSSValuePair* normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop); |
String radius; |
if (m_radius && m_radius->getValueID() != CSSValueClosestSide) |
@@ -164,8 +164,8 @@ static String buildEllipseString(const String& radiusX, const String& radiusY, c |
String CSSBasicShapeEllipseValue::customCSSText() const |
{ |
- RawPtr<CSSValuePair> normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft); |
- RawPtr<CSSValuePair> normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop); |
+ CSSValuePair* normalizedCX = buildSerializablePositionOffset(m_centerX, CSSValueLeft); |
+ CSSValuePair* normalizedCY = buildSerializablePositionOffset(m_centerY, CSSValueTop); |
String radiusX; |
String radiusY; |