| 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 8211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8222 || (id >= CSSValueCentral && id <= CSSValueMathematical)) | 8222 || (id >= CSSValueCentral && id <= CSSValueMathematical)) |
| 8223 validPrimitive = true; | 8223 validPrimitive = true; |
| 8224 break; | 8224 break; |
| 8225 | 8225 |
| 8226 case CSSPropertyEnableBackground: | 8226 case CSSPropertyEnableBackground: |
| 8227 // accumulate | new [x] [y] [width] [height] | inherit | 8227 // accumulate | new [x] [y] [width] [height] | inherit |
| 8228 if (id == CSSValueAccumulate) // TODO : new | 8228 if (id == CSSValueAccumulate) // TODO : new |
| 8229 validPrimitive = true; | 8229 validPrimitive = true; |
| 8230 break; | 8230 break; |
| 8231 | 8231 |
| 8232 case CSSPropertyClipPath: |
| 8233 case CSSPropertyFilter: |
| 8232 case CSSPropertyMarkerStart: | 8234 case CSSPropertyMarkerStart: |
| 8233 case CSSPropertyMarkerMid: | 8235 case CSSPropertyMarkerMid: |
| 8234 case CSSPropertyMarkerEnd: | 8236 case CSSPropertyMarkerEnd: |
| 8235 case CSSPropertyMask: | 8237 case CSSPropertyMask: |
| 8236 if (id == CSSValueNone) { | 8238 if (id == CSSValueNone) { |
| 8237 validPrimitive = true; | 8239 validPrimitive = true; |
| 8238 } else if (value->unit == CSSPrimitiveValue::CSS_URI) { | 8240 } else if (value->unit == CSSPrimitiveValue::CSS_URI) { |
| 8239 parsedValue = CSSPrimitiveValue::create(value->string, CSSPrimitiveV
alue::CSS_URI); | 8241 parsedValue = CSSPrimitiveValue::create(value->string, CSSPrimitiveV
alue::CSS_URI); |
| 8240 if (parsedValue) | 8242 if (parsedValue) |
| 8241 m_valueList->next(); | 8243 m_valueList->next(); |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8389 | 8391 |
| 8390 case CSSPropertyStrokeWidth: // <length> | inherit | 8392 case CSSPropertyStrokeWidth: // <length> | inherit |
| 8391 case CSSPropertyStrokeDashoffset: | 8393 case CSSPropertyStrokeDashoffset: |
| 8392 validPrimitive = validUnit(value, FLength | FPercent, SVGAttributeMode); | 8394 validPrimitive = validUnit(value, FLength | FPercent, SVGAttributeMode); |
| 8393 break; | 8395 break; |
| 8394 case CSSPropertyStrokeDasharray: // none | <dasharray> | inherit | 8396 case CSSPropertyStrokeDasharray: // none | <dasharray> | inherit |
| 8395 if (id == CSSValueNone) | 8397 if (id == CSSValueNone) |
| 8396 validPrimitive = true; | 8398 validPrimitive = true; |
| 8397 else | 8399 else |
| 8398 parsedValue = parseSVGStrokeDasharray(); | 8400 parsedValue = parseSVGStrokeDasharray(); |
| 8399 | |
| 8400 break; | 8401 break; |
| 8401 | 8402 |
| 8402 case CSSPropertyClipPath: // <uri> | none | inherit | |
| 8403 case CSSPropertyFilter: | |
| 8404 if (id == CSSValueNone) { | |
| 8405 validPrimitive = true; | |
| 8406 } else if (value->unit == CSSPrimitiveValue::CSS_URI) { | |
| 8407 parsedValue = CSSPrimitiveValue::create(value->string, (CSSPrimitive
Value::UnitType) value->unit); | |
| 8408 if (parsedValue) | |
| 8409 m_valueList->next(); | |
| 8410 } | |
| 8411 break; | |
| 8412 case CSSPropertyMaskType: // luminance | alpha | inherit | 8403 case CSSPropertyMaskType: // luminance | alpha | inherit |
| 8413 if (id == CSSValueLuminance || id == CSSValueAlpha) | 8404 if (id == CSSValueLuminance || id == CSSValueAlpha) |
| 8414 validPrimitive = true; | 8405 validPrimitive = true; |
| 8415 break; | 8406 break; |
| 8416 | 8407 |
| 8417 /* shorthand properties */ | 8408 /* shorthand properties */ |
| 8418 case CSSPropertyMarker: { | 8409 case CSSPropertyMarker: { |
| 8419 ShorthandScope scope(this, propId); | 8410 ShorthandScope scope(this, propId); |
| 8420 CSSPropertyParser::ImplicitScope implicitScope(this, PropertyImplicit); | 8411 CSSPropertyParser::ImplicitScope implicitScope(this, PropertyImplicit); |
| 8421 if (!parseValue(CSSPropertyMarkerStart, important)) | 8412 if (!parseValue(CSSPropertyMarkerStart, important)) |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8532 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8523 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| 8533 if (!seenStroke) | 8524 if (!seenStroke) |
| 8534 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8525 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
| 8535 if (!seenMarkers) | 8526 if (!seenMarkers) |
| 8536 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8527 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
| 8537 | 8528 |
| 8538 return parsedValues.release(); | 8529 return parsedValues.release(); |
| 8539 } | 8530 } |
| 8540 | 8531 |
| 8541 } // namespace blink | 8532 } // namespace blink |
| OLD | NEW |