| 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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) |
| 152 return true; | 152 return true; |
| 153 if (primitiveValue->isCalculated()) | 153 if (primitiveValue->isCalculated()) |
| 154 return primitiveValue->cssCalcValue()->permittedValueRange() == ValueRan
geNonNegative; | 154 return primitiveValue->cssCalcValue()->permittedValueRange() == ValueRan
geNonNegative; |
| 155 return primitiveValue->getDoubleValue() >= 0; | 155 return primitiveValue->getDoubleValue() >= 0; |
| 156 } | 156 } |
| 157 | 157 |
| 158 PassRefPtr<CSSPrimitiveValue> AnimatableLength::toCSSPrimitiveValue(NumberRange
range) const | 158 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> AnimatableLength::toCSSPrimitiveValue(
NumberRange range) const |
| 159 { | 159 { |
| 160 if (!m_cachedCSSPrimitiveValue || !isCompatibleWithRange(m_cachedCSSPrimitiv
eValue.get(), range)) { | 160 if (!m_cachedCSSPrimitiveValue || !isCompatibleWithRange(m_cachedCSSPrimitiv
eValue.get(), range)) { |
| 161 if (isCalc()) | 161 if (isCalc()) |
| 162 m_cachedCSSPrimitiveValue = CSSPrimitiveValue::create(CSSCalcValue::
create(m_calcExpression, range == AllValues ? ValueRangeAll : ValueRangeNonNegat
ive)); | 162 m_cachedCSSPrimitiveValue = CSSPrimitiveValue::create(CSSCalcValue::
create(m_calcExpression, range == AllValues ? ValueRangeAll : ValueRangeNonNegat
ive)); |
| 163 else | 163 else |
| 164 m_cachedCSSPrimitiveValue = CSSPrimitiveValue::create(clampedNumber(
range), static_cast<CSSPrimitiveValue::UnitTypes>(numberTypeToPrimitiveUnit(m_un
itType))); | 164 m_cachedCSSPrimitiveValue = CSSPrimitiveValue::create(clampedNumber(
range), static_cast<CSSPrimitiveValue::UnitTypes>(numberTypeToPrimitiveUnit(m_un
itType))); |
| 165 } | 165 } |
| 166 return m_cachedCSSPrimitiveValue; | 166 return m_cachedCSSPrimitiveValue; |
| 167 } | 167 } |
| 168 | 168 |
| (...skipping 70 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 |