| 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, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 | 260 |
| 261 DECLARE_TRACE_AFTER_DISPATCH(); | 261 DECLARE_TRACE_AFTER_DISPATCH(); |
| 262 | 262 |
| 263 static UnitType canonicalUnitTypeForCategory(UnitCategory); | 263 static UnitType canonicalUnitTypeForCategory(UnitCategory); |
| 264 static double conversionToCanonicalUnitsScaleFactor(UnitType); | 264 static double conversionToCanonicalUnitsScaleFactor(UnitType); |
| 265 | 265 |
| 266 // Returns true and populates lengthUnitType, if unitType is a length unit.
Otherwise, returns false. | 266 // Returns true and populates lengthUnitType, if unitType is a length unit.
Otherwise, returns false. |
| 267 static bool unitTypeToLengthUnitType(UnitType, LengthUnitType&); | 267 static bool unitTypeToLengthUnitType(UnitType, LengthUnitType&); |
| 268 static UnitType lengthUnitTypeToUnitType(LengthUnitType); | 268 static UnitType lengthUnitTypeToUnitType(LengthUnitType); |
| 269 | 269 |
| 270 CSSPrimitiveValue(CSSValueID); |
| 271 CSSPrimitiveValue(double, UnitType); |
| 272 |
| 270 private: | 273 private: |
| 271 CSSPrimitiveValue(CSSValueID); | |
| 272 CSSPrimitiveValue(const Length&, float zoom); | 274 CSSPrimitiveValue(const Length&, float zoom); |
| 273 CSSPrimitiveValue(double, UnitType); | |
| 274 | 275 |
| 275 template<typename T> CSSPrimitiveValue(T); // Defined in CSSPrimitiveValueMa
ppings.h | 276 template<typename T> CSSPrimitiveValue(T); // Defined in CSSPrimitiveValueMa
ppings.h |
| 276 | 277 |
| 277 template<typename T> CSSPrimitiveValue(T* val) | 278 template<typename T> CSSPrimitiveValue(T* val) |
| 278 : CSSValue(PrimitiveClass) | 279 : CSSValue(PrimitiveClass) |
| 279 { | 280 { |
| 280 init(val); | 281 init(val); |
| 281 } | 282 } |
| 282 | 283 |
| 283 static void create(int); // compile-time guard | 284 static void create(int); // compile-time guard |
| (...skipping 20 matching lines...) Expand all Loading... |
| 304 } m_value; | 305 } m_value; |
| 305 }; | 306 }; |
| 306 | 307 |
| 307 using CSSLengthArray = CSSPrimitiveValue::CSSLengthArray; | 308 using CSSLengthArray = CSSPrimitiveValue::CSSLengthArray; |
| 308 | 309 |
| 309 DEFINE_CSS_VALUE_TYPE_CASTS(CSSPrimitiveValue, isPrimitiveValue()); | 310 DEFINE_CSS_VALUE_TYPE_CASTS(CSSPrimitiveValue, isPrimitiveValue()); |
| 310 | 311 |
| 311 } // namespace blink | 312 } // namespace blink |
| 312 | 313 |
| 313 #endif // CSSPrimitiveValue_h | 314 #endif // CSSPrimitiveValue_h |
| OLD | NEW |