| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> | 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
| 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> | 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. | 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. |
| 7 * Copyright (C) 2015 Google Inc. All rights reserved. | 7 * Copyright (C) 2015 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Lesser General Public | 10 * modify it under the terms of the GNU Lesser General Public |
| (...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 953 | 953 |
| 954 static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSST
ransitionData::TransitionProperty& property) | 954 static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSST
ransitionData::TransitionProperty& property) |
| 955 { | 955 { |
| 956 if (property.propertyType == CSSTransitionData::TransitionNone) | 956 if (property.propertyType == CSSTransitionData::TransitionNone) |
| 957 return cssValuePool().createIdentifierValue(CSSValueNone); | 957 return cssValuePool().createIdentifierValue(CSSValueNone); |
| 958 if (property.propertyType == CSSTransitionData::TransitionAll) | 958 if (property.propertyType == CSSTransitionData::TransitionAll) |
| 959 return cssValuePool().createIdentifierValue(CSSValueAll); | 959 return cssValuePool().createIdentifierValue(CSSValueAll); |
| 960 if (property.propertyType == CSSTransitionData::TransitionUnknown) | 960 if (property.propertyType == CSSTransitionData::TransitionUnknown) |
| 961 return cssValuePool().createValue(property.propertyString, CSSPrimitiveV
alue::CSS_CUSTOM_IDENT); | 961 return cssValuePool().createValue(property.propertyString, CSSPrimitiveV
alue::CSS_CUSTOM_IDENT); |
| 962 ASSERT(property.propertyType == CSSTransitionData::TransitionSingleProperty)
; | 962 ASSERT(property.propertyType == CSSTransitionData::TransitionSingleProperty)
; |
| 963 return cssValuePool().createValue(getPropertyNameString(property.propertyId)
, CSSPrimitiveValue::CSS_CUSTOM_IDENT); | 963 return cssValuePool().createValue(getPropertyNameString(property.unresolvedP
roperty), CSSPrimitiveValue::CSS_CUSTOM_IDENT); |
| 964 } | 964 } |
| 965 | 965 |
| 966 static PassRefPtrWillBeRawPtr<CSSValue> valueForTransitionProperty(const CSSTran
sitionData* transitionData) | 966 static PassRefPtrWillBeRawPtr<CSSValue> valueForTransitionProperty(const CSSTran
sitionData* transitionData) |
| 967 { | 967 { |
| 968 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated()
; | 968 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated()
; |
| 969 if (transitionData) { | 969 if (transitionData) { |
| 970 for (size_t i = 0; i < transitionData->propertyList().size(); ++i) | 970 for (size_t i = 0; i < transitionData->propertyList().size(); ++i) |
| 971 list->append(createTransitionPropertyValue(transitionData->propertyL
ist()[i])); | 971 list->append(createTransitionPropertyValue(transitionData->propertyL
ist()[i])); |
| 972 } else { | 972 } else { |
| 973 list->append(cssValuePool().createIdentifierValue(CSSValueAll)); | 973 list->append(cssValuePool().createIdentifierValue(CSSValueAll)); |
| (...skipping 1592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2566 return zoomAdjustedPixelValueForLength(svgStyle.y(), style); | 2566 return zoomAdjustedPixelValueForLength(svgStyle.y(), style); |
| 2567 case CSSPropertyR: | 2567 case CSSPropertyR: |
| 2568 return zoomAdjustedPixelValueForLength(svgStyle.r(), style); | 2568 return zoomAdjustedPixelValueForLength(svgStyle.r(), style); |
| 2569 case CSSPropertyRx: | 2569 case CSSPropertyRx: |
| 2570 return zoomAdjustedPixelValueForLength(svgStyle.rx(), style); | 2570 return zoomAdjustedPixelValueForLength(svgStyle.rx(), style); |
| 2571 case CSSPropertyRy: | 2571 case CSSPropertyRy: |
| 2572 return zoomAdjustedPixelValueForLength(svgStyle.ry(), style); | 2572 return zoomAdjustedPixelValueForLength(svgStyle.ry(), style); |
| 2573 | 2573 |
| 2574 case CSSPropertyAll: | 2574 case CSSPropertyAll: |
| 2575 return nullptr; | 2575 return nullptr; |
| 2576 default: |
| 2577 break; |
| 2576 } | 2578 } |
| 2577 ASSERT_NOT_REACHED(); | 2579 ASSERT_NOT_REACHED(); |
| 2578 return nullptr; | 2580 return nullptr; |
| 2579 } | 2581 } |
| 2580 | 2582 |
| 2581 } | 2583 } |
| OLD | NEW |