| OLD | NEW |
| 1 /* | 1 /* |
| 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserv
ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 793 return getDoubleValue() * conversionToCanonicalUnitsScaleFactor(type); | 793 return getDoubleValue() * conversionToCanonicalUnitsScaleFactor(type); |
| 794 } | 794 } |
| 795 | 795 |
| 796 double CSSPrimitiveValue::getDoubleValue() const | 796 double CSSPrimitiveValue::getDoubleValue() const |
| 797 { | 797 { |
| 798 return m_primitiveUnitType != CSS_CALC ? m_value.num : m_value.calc->doubleV
alue(); | 798 return m_primitiveUnitType != CSS_CALC ? m_value.num : m_value.calc->doubleV
alue(); |
| 799 } | 799 } |
| 800 | 800 |
| 801 CSSPrimitiveValue::UnitType CSSPrimitiveValue::canonicalUnitTypeForCategory(Unit
Category category) | 801 CSSPrimitiveValue::UnitType CSSPrimitiveValue::canonicalUnitTypeForCategory(Unit
Category category) |
| 802 { | 802 { |
| 803 // The canonical unit type is chosen according to the way BisonCSSParser::va
lidUnit() chooses the default unit | 803 // The canonical unit type is chosen according to the way CSSPropertyParser:
:validUnit() chooses the default unit |
| 804 // in each category (based on unitflags). | 804 // in each category (based on unitflags). |
| 805 switch (category) { | 805 switch (category) { |
| 806 case UNumber: | 806 case UNumber: |
| 807 return CSS_NUMBER; | 807 return CSS_NUMBER; |
| 808 case ULength: | 808 case ULength: |
| 809 return CSS_PX; | 809 return CSS_PX; |
| 810 case UPercent: | 810 case UPercent: |
| 811 return CSS_UNKNOWN; // Cannot convert between numbers and percent. | 811 return CSS_UNKNOWN; // Cannot convert between numbers and percent. |
| 812 case UTime: | 812 case UTime: |
| 813 return CSS_MS; | 813 return CSS_MS; |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1224 visitor->trace(m_value.shape); | 1224 visitor->trace(m_value.shape); |
| 1225 break; | 1225 break; |
| 1226 default: | 1226 default: |
| 1227 break; | 1227 break; |
| 1228 } | 1228 } |
| 1229 #endif | 1229 #endif |
| 1230 CSSValue::traceAfterDispatch(visitor); | 1230 CSSValue::traceAfterDispatch(visitor); |
| 1231 } | 1231 } |
| 1232 | 1232 |
| 1233 } // namespace blink | 1233 } // namespace blink |
| OLD | NEW |