| 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 4427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4438 } | 4438 } |
| 4439 | 4439 |
| 4440 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseBasicShapeAndOrBox() | 4440 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseBasicShapeAndOrBox() |
| 4441 { | 4441 { |
| 4442 CSSParserValue* value = m_valueList->current(); | 4442 CSSParserValue* value = m_valueList->current(); |
| 4443 | 4443 |
| 4444 bool shapeFound = false; | 4444 bool shapeFound = false; |
| 4445 bool boxFound = false; | 4445 bool boxFound = false; |
| 4446 CSSValueID valueId; | 4446 CSSValueID valueId; |
| 4447 | 4447 |
| 4448 RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); | 4448 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; |
| 4449 for (unsigned i = 0; i < 2; ++i) { | 4449 for (unsigned i = 0; i < 2; ++i) { |
| 4450 if (!value) | 4450 if (!value) |
| 4451 break; | 4451 break; |
| 4452 valueId = value->id; | 4452 valueId = value->id; |
| 4453 if (value->unit == CSSParserValue::Function && !shapeFound) { | 4453 if (value->unit == CSSParserValue::Function && !shapeFound) { |
| 4454 // parseBasicShape already asks for the next value list item. | 4454 // parseBasicShape already asks for the next value list item. |
| 4455 RefPtr<CSSPrimitiveValue> shapeValue = parseBasicShape(); | 4455 RefPtrWillBeRawPtr<CSSPrimitiveValue> shapeValue = parseBasicShape()
; |
| 4456 if (!shapeValue) | 4456 if (!shapeValue) |
| 4457 return nullptr; | 4457 return nullptr; |
| 4458 list->append(shapeValue.release()); | 4458 list->append(shapeValue.release()); |
| 4459 shapeFound = true; | 4459 shapeFound = true; |
| 4460 } else if (isBoxValue(valueId) && !boxFound) { | 4460 } else if (isBoxValue(valueId) && !boxFound) { |
| 4461 list->append(parseValidPrimitive(valueId, value)); | 4461 list->append(parseValidPrimitive(valueId, value)); |
| 4462 boxFound = true; | 4462 boxFound = true; |
| 4463 m_valueList->next(); | 4463 m_valueList->next(); |
| 4464 } else { | 4464 } else { |
| 4465 return nullptr; | 4465 return nullptr; |
| (...skipping 3974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8440 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8440 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| 8441 if (!seenStroke) | 8441 if (!seenStroke) |
| 8442 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8442 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
| 8443 if (!seenMarkers) | 8443 if (!seenMarkers) |
| 8444 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8444 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
| 8445 | 8445 |
| 8446 return parsedValues.release(); | 8446 return parsedValues.release(); |
| 8447 } | 8447 } |
| 8448 | 8448 |
| 8449 } // namespace WebCore | 8449 } // namespace WebCore |
| OLD | NEW |