Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Unified Diff: Source/core/css/CSSPrimitiveValue.cpp

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 5 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.h ('k') | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSPrimitiveValue.cpp
diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp
index a4eb31adb59c44b655d1fcb7e70f63912d60a1b1..e92fcc2ec47a90603c443cb09080623d94076123 100644
--- a/Source/core/css/CSSPrimitiveValue.cpp
+++ b/Source/core/css/CSSPrimitiveValue.cpp
@@ -218,21 +218,21 @@ static const AtomicString& valueName(CSSValueID valueID)
}
CSSPrimitiveValue::CSSPrimitiveValue(CSSValueID valueID)
- : CSSValue(PrimitiveClass)
+ : CSSValueObject(PrimitiveClass)
{
m_primitiveUnitType = CSS_VALUE_ID;
m_value.valueID = valueID;
}
CSSPrimitiveValue::CSSPrimitiveValue(CSSPropertyID propertyID)
- : CSSValue(PrimitiveClass)
+ : CSSValueObject(PrimitiveClass)
{
m_primitiveUnitType = CSS_PROPERTY_ID;
m_value.propertyID = propertyID;
}
CSSPrimitiveValue::CSSPrimitiveValue(double num, UnitType type)
- : CSSValue(PrimitiveClass)
+ : CSSValueObject(PrimitiveClass)
{
m_primitiveUnitType = type;
ASSERT(std::isfinite(num));
@@ -240,7 +240,7 @@ CSSPrimitiveValue::CSSPrimitiveValue(double num, UnitType type)
}
CSSPrimitiveValue::CSSPrimitiveValue(const String& str, UnitType type)
- : CSSValue(PrimitiveClass)
+ : CSSValueObject(PrimitiveClass)
{
m_primitiveUnitType = type;
m_value.string = str.impl();
@@ -249,20 +249,20 @@ CSSPrimitiveValue::CSSPrimitiveValue(const String& str, UnitType type)
}
CSSPrimitiveValue::CSSPrimitiveValue(const LengthSize& lengthSize, const ComputedStyle& style)
- : CSSValue(PrimitiveClass)
+ : CSSValueObject(PrimitiveClass)
{
init(lengthSize, style);
}
CSSPrimitiveValue::CSSPrimitiveValue(RGBA32 color)
- : CSSValue(PrimitiveClass)
+ : CSSValueObject(PrimitiveClass)
{
m_primitiveUnitType = CSS_RGBCOLOR;
m_value.rgbcolor = color;
}
CSSPrimitiveValue::CSSPrimitiveValue(const Length& length, float zoom)
- : CSSValue(PrimitiveClass)
+ : CSSValueObject(PrimitiveClass)
{
switch (length.type()) {
case Auto:
@@ -1146,7 +1146,7 @@ DEFINE_TRACE_AFTER_DISPATCH(CSSPrimitiveValue)
break;
}
#endif
- CSSValue::traceAfterDispatch(visitor);
+ CSSValueObject::traceAfterDispatch(visitor);
}
} // namespace blink
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.h ('k') | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698