| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. | 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
All rights reserved. |
| 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> | 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> |
| 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. |
| 9 * Copyright (C) 2012 Intel Corporation. All rights reserved. | 9 * Copyright (C) 2012 Intel Corporation. All rights reserved. |
| 10 * | 10 * |
| (...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1117 case CSSPropertyInternalMarqueeIncrement: | 1117 case CSSPropertyInternalMarqueeIncrement: |
| 1118 validPrimitive = validUnit(value, FLength | FPercent); | 1118 validPrimitive = validUnit(value, FLength | FPercent); |
| 1119 break; | 1119 break; |
| 1120 case CSSPropertyInternalMarqueeRepetition: | 1120 case CSSPropertyInternalMarqueeRepetition: |
| 1121 if (id == CSSValueInfinite) | 1121 if (id == CSSValueInfinite) |
| 1122 validPrimitive = true; | 1122 validPrimitive = true; |
| 1123 else | 1123 else |
| 1124 validPrimitive = validUnit(value, FInteger | FNonNeg); | 1124 validPrimitive = validUnit(value, FInteger | FNonNeg); |
| 1125 break; | 1125 break; |
| 1126 case CSSPropertyInternalMarqueeSpeed: | 1126 case CSSPropertyInternalMarqueeSpeed: |
| 1127 if (id == CSSValueNormal || id == CSSValueSlow || id == CSSValueFast) | 1127 validPrimitive = validUnit(value, FInteger | FNonNeg); |
| 1128 validPrimitive = true; | |
| 1129 else | |
| 1130 validPrimitive = validUnit(value, FTime | FInteger | FNonNeg); | |
| 1131 break; | 1128 break; |
| 1132 case CSSPropertyTransform: | 1129 case CSSPropertyTransform: |
| 1133 case CSSPropertyWebkitTransform: | 1130 case CSSPropertyWebkitTransform: |
| 1134 if (id == CSSValueNone) | 1131 if (id == CSSValueNone) |
| 1135 validPrimitive = true; | 1132 validPrimitive = true; |
| 1136 else { | 1133 else { |
| 1137 RefPtrWillBeRawPtr<CSSValue> transformValue = parseTransform(propId)
; | 1134 RefPtrWillBeRawPtr<CSSValue> transformValue = parseTransform(propId)
; |
| 1138 if (transformValue) { | 1135 if (transformValue) { |
| 1139 addProperty(propId, transformValue.release(), important); | 1136 addProperty(propId, transformValue.release(), important); |
| 1140 return true; | 1137 return true; |
| (...skipping 7395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8536 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8533 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| 8537 if (!seenStroke) | 8534 if (!seenStroke) |
| 8538 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8535 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
| 8539 if (!seenMarkers) | 8536 if (!seenMarkers) |
| 8540 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8537 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
| 8541 | 8538 |
| 8542 return parsedValues.release(); | 8539 return parsedValues.release(); |
| 8543 } | 8540 } |
| 8544 | 8541 |
| 8545 } // namespace blink | 8542 } // namespace blink |
| OLD | NEW |