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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 value->unit = (unitflags & FLength) ? CSSPrimitiveValue::CSS_PX : CS
SPrimitiveValue::CSS_DEG; | 248 value->unit = (unitflags & FLength) ? CSSPrimitiveValue::CSS_PX : CS
SPrimitiveValue::CSS_DEG; |
249 return true; | 249 return true; |
250 } | 250 } |
251 if ((unitflags & FInteger) && value->isInt) | 251 if ((unitflags & FInteger) && value->isInt) |
252 return true; | 252 return true; |
253 if ((unitflags & FPositiveInteger) && value->isInt && value->fValue > 0) | 253 if ((unitflags & FPositiveInteger) && value->isInt && value->fValue > 0) |
254 return true; | 254 return true; |
255 return false; | 255 return false; |
256 case CSSPrimitiveValue::CSS_PERCENTAGE: | 256 case CSSPrimitiveValue::CSS_PERCENTAGE: |
257 return unitflags & FPercent; | 257 return unitflags & FPercent; |
258 case CSSParserValue::Q_EMS: | 258 case CSSPrimitiveValue::CSS_QEM: |
259 if (cssParserMode != UASheetMode) | 259 if (cssParserMode != UASheetMode) |
260 return false; | 260 return false; |
261 /* fallthrough intentional */ | 261 /* fallthrough intentional */ |
262 case CSSPrimitiveValue::CSS_EMS: | 262 case CSSPrimitiveValue::CSS_EMS: |
263 case CSSPrimitiveValue::CSS_REMS: | 263 case CSSPrimitiveValue::CSS_REMS: |
264 case CSSPrimitiveValue::CSS_CHS: | 264 case CSSPrimitiveValue::CSS_CHS: |
265 case CSSPrimitiveValue::CSS_EXS: | 265 case CSSPrimitiveValue::CSS_EXS: |
266 case CSSPrimitiveValue::CSS_PX: | 266 case CSSPrimitiveValue::CSS_PX: |
267 case CSSPrimitiveValue::CSS_CM: | 267 case CSSPrimitiveValue::CSS_CM: |
268 case CSSPrimitiveValue::CSS_MM: | 268 case CSSPrimitiveValue::CSS_MM: |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 if (identifier) | 384 if (identifier) |
385 return cssValuePool().createIdentifierValue(identifier); | 385 return cssValuePool().createIdentifierValue(identifier); |
386 if (value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <= CSSPrimit
iveValue::CSS_KHZ) | 386 if (value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <= CSSPrimit
iveValue::CSS_KHZ) |
387 return createPrimitiveNumericValue(value); | 387 return createPrimitiveNumericValue(value); |
388 if (value->unit >= CSSPrimitiveValue::CSS_TURN && value->unit <= CSSPrimitiv
eValue::CSS_CHS) | 388 if (value->unit >= CSSPrimitiveValue::CSS_TURN && value->unit <= CSSPrimitiv
eValue::CSS_CHS) |
389 return createPrimitiveNumericValue(value); | 389 return createPrimitiveNumericValue(value); |
390 if (value->unit >= CSSPrimitiveValue::CSS_VW && value->unit <= CSSPrimitiveV
alue::CSS_VMAX) | 390 if (value->unit >= CSSPrimitiveValue::CSS_VW && value->unit <= CSSPrimitiveV
alue::CSS_VMAX) |
391 return createPrimitiveNumericValue(value); | 391 return createPrimitiveNumericValue(value); |
392 if (value->unit >= CSSPrimitiveValue::CSS_DPPX && value->unit <= CSSPrimitiv
eValue::CSS_DPCM) | 392 if (value->unit >= CSSPrimitiveValue::CSS_DPPX && value->unit <= CSSPrimitiv
eValue::CSS_DPCM) |
393 return createPrimitiveNumericValue(value); | 393 return createPrimitiveNumericValue(value); |
394 if (value->unit >= CSSParserValue::Q_EMS) | 394 if (value->unit == CSSPrimitiveValue::CSS_QEM) |
395 return CSSPrimitiveValue::createAllowingMarginQuirk(value->fValue, CSSPr
imitiveValue::CSS_EMS); | 395 return CSSPrimitiveValue::createAllowingMarginQuirk(value->fValue, CSSPr
imitiveValue::CSS_EMS); |
396 if (isCalculation(value)) | 396 if (isCalculation(value)) |
397 return CSSPrimitiveValue::create(m_parsedCalculation.release()); | 397 return CSSPrimitiveValue::create(m_parsedCalculation.release()); |
398 | 398 |
399 return nullptr; | 399 return nullptr; |
400 } | 400 } |
401 | 401 |
402 void CSSPropertyParser::addExpandedPropertyForValue(CSSPropertyID propId, PassRe
fPtrWillBeRawPtr<CSSValue> prpValue, bool important) | 402 void CSSPropertyParser::addExpandedPropertyForValue(CSSPropertyID propId, PassRe
fPtrWillBeRawPtr<CSSValue> prpValue, bool important) |
403 { | 403 { |
404 const StylePropertyShorthand& shorthand = shorthandForProperty(propId); | 404 const StylePropertyShorthand& shorthand = shorthandForProperty(propId); |
(...skipping 7731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8136 | 8136 |
8137 if (validPrimitive) { | 8137 if (validPrimitive) { |
8138 if (id) | 8138 if (id) |
8139 parsedValue = CSSPrimitiveValue::createIdentifier(id); | 8139 parsedValue = CSSPrimitiveValue::createIdentifier(id); |
8140 else if (value->unit == CSSPrimitiveValue::CSS_STRING) | 8140 else if (value->unit == CSSPrimitiveValue::CSS_STRING) |
8141 parsedValue = CSSPrimitiveValue::create(value->string, (CSSPrimitive
Value::UnitType) value->unit); | 8141 parsedValue = CSSPrimitiveValue::create(value->string, (CSSPrimitive
Value::UnitType) value->unit); |
8142 else if (value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <=
CSSPrimitiveValue::CSS_KHZ) | 8142 else if (value->unit >= CSSPrimitiveValue::CSS_NUMBER && value->unit <=
CSSPrimitiveValue::CSS_KHZ) |
8143 parsedValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitive
Value::UnitType) value->unit); | 8143 parsedValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitive
Value::UnitType) value->unit); |
8144 else if (value->unit == CSSPrimitiveValue::CSS_REMS || value->unit == CS
SPrimitiveValue::CSS_CHS) | 8144 else if (value->unit == CSSPrimitiveValue::CSS_REMS || value->unit == CS
SPrimitiveValue::CSS_CHS) |
8145 parsedValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitive
Value::UnitType)value->unit); | 8145 parsedValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitive
Value::UnitType)value->unit); |
8146 else if (value->unit >= CSSParserValue::Q_EMS) | 8146 else if (value->unit == CSSPrimitiveValue::CSS_QEM) |
8147 parsedValue = CSSPrimitiveValue::createAllowingMarginQuirk(value->fV
alue, CSSPrimitiveValue::CSS_EMS); | 8147 parsedValue = CSSPrimitiveValue::createAllowingMarginQuirk(value->fV
alue, CSSPrimitiveValue::CSS_EMS); |
8148 if (isCalculation(value)) { | 8148 if (isCalculation(value)) { |
8149 // FIXME calc() http://webkit.org/b/16662 : actually create a CSSPri
mitiveValue here, ie | 8149 // FIXME calc() http://webkit.org/b/16662 : actually create a CSSPri
mitiveValue here, ie |
8150 // parsedValue = CSSPrimitiveValue::create(m_parsedCalculation.relea
se()); | 8150 // parsedValue = CSSPrimitiveValue::create(m_parsedCalculation.relea
se()); |
8151 m_parsedCalculation.release(); | 8151 m_parsedCalculation.release(); |
8152 parsedValue = nullptr; | 8152 parsedValue = nullptr; |
8153 } | 8153 } |
8154 m_valueList->next(); | 8154 m_valueList->next(); |
8155 } | 8155 } |
8156 if (!parsedValue || (m_valueList->current() && !inShorthand())) | 8156 if (!parsedValue || (m_valueList->current() && !inShorthand())) |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8476 } | 8476 } |
8477 } | 8477 } |
8478 | 8478 |
8479 if (!list->length()) | 8479 if (!list->length()) |
8480 return nullptr; | 8480 return nullptr; |
8481 | 8481 |
8482 return list.release(); | 8482 return list.release(); |
8483 } | 8483 } |
8484 | 8484 |
8485 } // namespace blink | 8485 } // namespace blink |
OLD | NEW |