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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 ASSERT_NOT_REACHED(); | 282 ASSERT_NOT_REACHED(); |
283 break; | 283 break; |
284 } | 284 } |
285 } | 285 } |
286 | 286 |
287 void CSSPrimitiveValue::init(UnitType type) | 287 void CSSPrimitiveValue::init(UnitType type) |
288 { | 288 { |
289 m_primitiveUnitType = static_cast<unsigned>(type); | 289 m_primitiveUnitType = static_cast<unsigned>(type); |
290 } | 290 } |
291 | 291 |
292 void CSSPrimitiveValue::init(RawPtr<CSSCalcValue> c) | 292 void CSSPrimitiveValue::init(CSSCalcValue* c) |
293 { | 293 { |
294 init(UnitType::Calc); | 294 init(UnitType::Calc); |
295 m_hasCachedCSSText = false; | 295 m_hasCachedCSSText = false; |
296 m_value.calc = c.leakRef(); | 296 m_value.calc = c; |
297 } | 297 } |
298 | 298 |
299 CSSPrimitiveValue::~CSSPrimitiveValue() | 299 CSSPrimitiveValue::~CSSPrimitiveValue() |
300 { | 300 { |
301 #if !ENABLE(OILPAN) | 301 #if !ENABLE(OILPAN) |
302 switch (type()) { | 302 switch (type()) { |
303 case UnitType::Calc: | 303 case UnitType::Calc: |
304 // We must not call deref() when oilpan is enabled because m_value.calc
is traced. | 304 // We must not call deref() when oilpan is enabled because m_value.calc
is traced. |
305 m_value.calc->deref(); | 305 m_value.calc->deref(); |
306 break; | 306 break; |
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
834 case UnitType::Calc: | 834 case UnitType::Calc: |
835 visitor->trace(m_value.calc); | 835 visitor->trace(m_value.calc); |
836 break; | 836 break; |
837 default: | 837 default: |
838 break; | 838 break; |
839 } | 839 } |
840 CSSValue::traceAfterDispatch(visitor); | 840 CSSValue::traceAfterDispatch(visitor); |
841 } | 841 } |
842 | 842 |
843 } // namespace blink | 843 } // namespace blink |
OLD | NEW |