| 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 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1108 validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonN
eg)); | 1108 validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonN
eg)); |
| 1109 break; | 1109 break; |
| 1110 case CSSPropertyFlexGrow: | 1110 case CSSPropertyFlexGrow: |
| 1111 case CSSPropertyFlexShrink: | 1111 case CSSPropertyFlexShrink: |
| 1112 validPrimitive = validUnit(value, FNumber | FNonNeg); | 1112 validPrimitive = validUnit(value, FNumber | FNonNeg); |
| 1113 break; | 1113 break; |
| 1114 case CSSPropertyOrder: | 1114 case CSSPropertyOrder: |
| 1115 validPrimitive = validUnit(value, FInteger, HTMLStandardMode); | 1115 validPrimitive = validUnit(value, FInteger, HTMLStandardMode); |
| 1116 break; | 1116 break; |
| 1117 case CSSPropertyInternalMarqueeIncrement: | 1117 case CSSPropertyInternalMarqueeIncrement: |
| 1118 if (id == CSSValueSmall || id == CSSValueLarge || id == CSSValueMedium) | 1118 validPrimitive = validUnit(value, FLength | FPercent); |
| 1119 validPrimitive = true; | |
| 1120 else | |
| 1121 validPrimitive = validUnit(value, FLength | FPercent); | |
| 1122 break; | 1119 break; |
| 1123 case CSSPropertyInternalMarqueeRepetition: | 1120 case CSSPropertyInternalMarqueeRepetition: |
| 1124 if (id == CSSValueInfinite) | 1121 if (id == CSSValueInfinite) |
| 1125 validPrimitive = true; | 1122 validPrimitive = true; |
| 1126 else | 1123 else |
| 1127 validPrimitive = validUnit(value, FInteger | FNonNeg); | 1124 validPrimitive = validUnit(value, FInteger | FNonNeg); |
| 1128 break; | 1125 break; |
| 1129 case CSSPropertyInternalMarqueeSpeed: | 1126 case CSSPropertyInternalMarqueeSpeed: |
| 1130 if (id == CSSValueNormal || id == CSSValueSlow || id == CSSValueFast) | 1127 if (id == CSSValueNormal || id == CSSValueSlow || id == CSSValueFast) |
| 1131 validPrimitive = true; | 1128 validPrimitive = true; |
| (...skipping 7407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8539 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8536 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| 8540 if (!seenStroke) | 8537 if (!seenStroke) |
| 8541 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8538 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
| 8542 if (!seenMarkers) | 8539 if (!seenMarkers) |
| 8543 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8540 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
| 8544 | 8541 |
| 8545 return parsedValues.release(); | 8542 return parsedValues.release(); |
| 8546 } | 8543 } |
| 8547 | 8544 |
| 8548 } // namespace blink | 8545 } // namespace blink |
| OLD | NEW |