| 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 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1270 break; | 1270 break; |
| 1271 case CSSPropertyWebkitColumnCount: | 1271 case CSSPropertyWebkitColumnCount: |
| 1272 parsedValue = parseColumnCount(); | 1272 parsedValue = parseColumnCount(); |
| 1273 break; | 1273 break; |
| 1274 case CSSPropertyWebkitColumnGap: // normal | <length> | 1274 case CSSPropertyWebkitColumnGap: // normal | <length> |
| 1275 if (id == CSSValueNormal) | 1275 if (id == CSSValueNormal) |
| 1276 validPrimitive = true; | 1276 validPrimitive = true; |
| 1277 else | 1277 else |
| 1278 validPrimitive = validUnit(value, FLength | FNonNeg); | 1278 validPrimitive = validUnit(value, FLength | FNonNeg); |
| 1279 break; | 1279 break; |
| 1280 case CSSPropertyWebkitColumnAxis: | |
| 1281 if (id == CSSValueHorizontal || id == CSSValueVertical || id == CSSValue
Auto) | |
| 1282 validPrimitive = true; | |
| 1283 break; | |
| 1284 case CSSPropertyWebkitColumnProgression: | |
| 1285 if (id == CSSValueNormal || id == CSSValueReverse) | |
| 1286 validPrimitive = true; | |
| 1287 break; | |
| 1288 case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the
unprefixed property) | 1280 case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the
unprefixed property) |
| 1289 if (id == CSSValueAll || id == CSSValueNone) | 1281 if (id == CSSValueAll || id == CSSValueNone) |
| 1290 validPrimitive = true; | 1282 validPrimitive = true; |
| 1291 else | 1283 else |
| 1292 validPrimitive = validUnit(value, FNumber | FNonNeg) && value->fValu
e == 1; | 1284 validPrimitive = validUnit(value, FNumber | FNonNeg) && value->fValu
e == 1; |
| 1293 break; | 1285 break; |
| 1294 case CSSPropertyWebkitColumnWidth: // auto | <length> | 1286 case CSSPropertyWebkitColumnWidth: // auto | <length> |
| 1295 parsedValue = parseColumnWidth(); | 1287 parsedValue = parseColumnWidth(); |
| 1296 break; | 1288 break; |
| 1297 case CSSPropertyWillChange: | 1289 case CSSPropertyWillChange: |
| (...skipping 6919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8217 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8209 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| 8218 if (!seenStroke) | 8210 if (!seenStroke) |
| 8219 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8211 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
| 8220 if (!seenMarkers) | 8212 if (!seenMarkers) |
| 8221 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8213 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
| 8222 | 8214 |
| 8223 return parsedValues.release(); | 8215 return parsedValues.release(); |
| 8224 } | 8216 } |
| 8225 | 8217 |
| 8226 } // namespace WebCore | 8218 } // namespace WebCore |
| OLD | NEW |