Source/core/animation/AnimatableLength.cpp - Issue 166443003: Move CSSCalcExpressionNode and subclasses to the oilpan heap.

Side by Side Diff: Source/core/animation/AnimatableLength.cpp

Issue 166443003: Move CSSCalcExpressionNode and subclasses to the oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 120 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 bool AnimatableLength::equalTo(const AnimatableValue* value) const	131 bool AnimatableLength::equalTo(const AnimatableValue* value) const

132 {	132 {

133 const AnimatableLength* length = toAnimatableLength(value);	133 const AnimatableLength* length = toAnimatableLength(value);

134 if (m_unitType != length->m_unitType)	134 if (m_unitType != length->m_unitType)

135 return false;	135 return false;

136 if (isCalc())	136 if (isCalc())

137 return m_calcExpression == length->m_calcExpression \|\| m_calcExpression- >equals(*length->m_calcExpression);	137 return m_calcExpression == length->m_calcExpression \|\| m_calcExpression- >equals(*length->m_calcExpression);

138 return m_number == length->m_number;	138 return m_number == length->m_number;

139 }	139 }

140	140

141 PassRefPtr<CSSCalcExpressionNode> AnimatableLength::toCSSCalcExpressionNode() co nst	141 PassRefPtrWillBeRawPtr<CSSCalcExpressionNode> AnimatableLength::toCSSCalcExpress ionNode() const

142 {	142 {

143 if (isCalc())	143 if (isCalc())

144 return m_calcExpression;	144 return m_calcExpression;

145 return CSSCalcValue::createExpressionNode(toCSSPrimitiveValue(AllValues), m_ number == trunc(m_number));	145 return CSSCalcValue::createExpressionNode(toCSSPrimitiveValue(AllValues), m_ number == trunc(m_number));

146 }	146 }

147	147

148 static bool isCompatibleWithRange(const CSSPrimitiveValue* primitiveValue, Numbe rRange range)	148 static bool isCompatibleWithRange(const CSSPrimitiveValue* primitiveValue, Numbe rRange range)

149 {	149 {

150 ASSERT(primitiveValue);	150 ASSERT(primitiveValue);

151 if (range == AllValues)	151 if (range == AllValues)

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
239 case UnitTypeViewportMax:	239 case UnitTypeViewportMax:

240 return CSSPrimitiveValue::CSS_VMAX;	240 return CSSPrimitiveValue::CSS_VMAX;

241 case UnitTypeCalc:	241 case UnitTypeCalc:

242 return CSSPrimitiveValue::CSS_UNKNOWN;	242 return CSSPrimitiveValue::CSS_UNKNOWN;

243 }	243 }

244 ASSERT_NOT_REACHED();	244 ASSERT_NOT_REACHED();

245 return CSSPrimitiveValue::CSS_UNKNOWN;	245 return CSSPrimitiveValue::CSS_UNKNOWN;

246 }	246 }

247	247

248 } // namespace WebCore	248 } // namespace WebCore

OLD	NEW

« no previous file with comments | « Source/core/animation/AnimatableLength.h ('k') | Source/core/css/CSSCalculationValue.h » ('j') | Source/core/css/CSSCalculationValue.cpp » ('J')