| 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 2613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2624 if (isValueConflictingWithCurrentEdge(ident1, secondPositionKeyword)) | 2624 if (isValueConflictingWithCurrentEdge(ident1, secondPositionKeyword)) |
| 2625 return; | 2625 return; |
| 2626 | 2626 |
| 2627 value1 = createPrimitiveValuePair(parsedValue1, firstPositionValue); | 2627 value1 = createPrimitiveValuePair(parsedValue1, firstPositionValue); |
| 2628 value2 = createPrimitiveValuePair(cssValuePool().createIdentifierValue(s
econdPositionKeyword), secondPositionValue); | 2628 value2 = createPrimitiveValuePair(cssValuePool().createIdentifierValue(s
econdPositionKeyword), secondPositionValue); |
| 2629 } | 2629 } |
| 2630 | 2630 |
| 2631 if (ident1 == CSSValueTop || ident1 == CSSValueBottom || swapNeeded) | 2631 if (ident1 == CSSValueTop || ident1 == CSSValueBottom || swapNeeded) |
| 2632 value1.swap(value2); | 2632 value1.swap(value2); |
| 2633 | 2633 |
| 2634 #ifndef NDEBUG | 2634 #if ENABLE(ASSERT) |
| 2635 CSSPrimitiveValue* first = toCSSPrimitiveValue(value1.get()); | 2635 CSSPrimitiveValue* first = toCSSPrimitiveValue(value1.get()); |
| 2636 CSSPrimitiveValue* second = toCSSPrimitiveValue(value2.get()); | 2636 CSSPrimitiveValue* second = toCSSPrimitiveValue(value2.get()); |
| 2637 ident1 = first->getPairValue()->first()->getValueID(); | 2637 ident1 = first->getPairValue()->first()->getValueID(); |
| 2638 ident2 = second->getPairValue()->first()->getValueID(); | 2638 ident2 = second->getPairValue()->first()->getValueID(); |
| 2639 ASSERT(ident1 == CSSValueLeft || ident1 == CSSValueRight); | 2639 ASSERT(ident1 == CSSValueLeft || ident1 == CSSValueRight); |
| 2640 ASSERT(ident2 == CSSValueBottom || ident2 == CSSValueTop); | 2640 ASSERT(ident2 == CSSValueBottom || ident2 == CSSValueTop); |
| 2641 #endif | 2641 #endif |
| 2642 } | 2642 } |
| 2643 | 2643 |
| 2644 inline bool CSSPropertyParser::isPotentialPositionValue(CSSParserValue* value) | 2644 inline bool CSSPropertyParser::isPotentialPositionValue(CSSParserValue* value) |
| (...skipping 5852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8497 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8497 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
| 8498 if (!seenStroke) | 8498 if (!seenStroke) |
| 8499 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8499 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
| 8500 if (!seenMarkers) | 8500 if (!seenMarkers) |
| 8501 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8501 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
| 8502 | 8502 |
| 8503 return parsedValues.release(); | 8503 return parsedValues.release(); |
| 8504 } | 8504 } |
| 8505 | 8505 |
| 8506 } // namespace WebCore | 8506 } // namespace WebCore |
| OLD | NEW |