| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 bool isPrimitiveLength = primitiveUnitToNumberType(primitiveValue->primi
tiveType(), unitType); | 49 bool isPrimitiveLength = primitiveUnitToNumberType(primitiveValue->primi
tiveType(), unitType); |
| 50 ASSERT_UNUSED(isPrimitiveLength, isPrimitiveLength); | 50 ASSERT_UNUSED(isPrimitiveLength, isPrimitiveLength); |
| 51 const double scale = CSSPrimitiveValue::conversionToCanonicalUnitsScaleF
actor(primitiveValue->primitiveType()); | 51 const double scale = CSSPrimitiveValue::conversionToCanonicalUnitsScaleF
actor(primitiveValue->primitiveType()); |
| 52 return create(primitiveValue->getDoubleValue() * scale, unitType, primit
iveValue); | 52 return create(primitiveValue->getDoubleValue() * scale, unitType, primit
iveValue); |
| 53 } | 53 } |
| 54 | 54 |
| 55 if (value->isCalcValue()) | 55 if (value->isCalcValue()) |
| 56 return create(toCSSCalcValue(value)->expressionNode()); | 56 return create(toCSSCalcValue(value)->expressionNode()); |
| 57 | 57 |
| 58 ASSERT_NOT_REACHED(); | 58 ASSERT_NOT_REACHED(); |
| 59 return 0; | 59 return nullptr; |
| 60 } | 60 } |
| 61 | 61 |
| 62 bool AnimatableLength::canCreateFrom(const CSSValue* value) | 62 bool AnimatableLength::canCreateFrom(const CSSValue* value) |
| 63 { | 63 { |
| 64 ASSERT(value); | 64 ASSERT(value); |
| 65 if (value->isPrimitiveValue()) { | 65 if (value->isPrimitiveValue()) { |
| 66 const CSSPrimitiveValue* primitiveValue = WebCore::toCSSPrimitiveValue(v
alue); | 66 const CSSPrimitiveValue* primitiveValue = WebCore::toCSSPrimitiveValue(v
alue); |
| 67 if (primitiveValue->cssCalcValue()) | 67 if (primitiveValue->cssCalcValue()) |
| 68 return true; | 68 return true; |
| 69 | 69 |
| (...skipping 169 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 |