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 2834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2845 } | 2845 } |
2846 } else if (!parsedValue2 && propId == CSSPropertyWebkitBackgroundSize) { | 2846 } else if (!parsedValue2 && propId == CSSPropertyWebkitBackgroundSize) { |
2847 // For backwards compatibility we set the second value to the first if i
t is omitted. | 2847 // For backwards compatibility we set the second value to the first if i
t is omitted. |
2848 // We only need to do this for -webkit-background-size. It should be saf
e to let masks match | 2848 // We only need to do this for -webkit-background-size. It should be saf
e to let masks match |
2849 // the real property. | 2849 // the real property. |
2850 parsedValue2 = parsedValue1; | 2850 parsedValue2 = parsedValue1; |
2851 } | 2851 } |
2852 | 2852 |
2853 if (!parsedValue2) | 2853 if (!parsedValue2) |
2854 return parsedValue1; | 2854 return parsedValue1; |
2855 return createPrimitiveValuePair(parsedValue1.release(), parsedValue2.release
()); | 2855 |
| 2856 Pair::IdenticalValuesPolicy policy = propId == CSSPropertyWebkitBackgroundSi
ze ? |
| 2857 Pair::DropIdenticalValues : Pair::KeepIdenticalValues; |
| 2858 |
| 2859 return createPrimitiveValuePair(parsedValue1.release(), parsedValue2.release
(), policy); |
2856 } | 2860 } |
2857 | 2861 |
2858 bool CSSPropertyParser::parseFillProperty(CSSPropertyID propId, CSSPropertyID& p
ropId1, CSSPropertyID& propId2, | 2862 bool CSSPropertyParser::parseFillProperty(CSSPropertyID propId, CSSPropertyID& p
ropId1, CSSPropertyID& propId2, |
2859 RefPtrWillBeRawPtr<CSSValue>& retValue1, RefPtrWillBeRawPtr<CSSValue>& retVa
lue2) | 2863 RefPtrWillBeRawPtr<CSSValue>& retValue1, RefPtrWillBeRawPtr<CSSValue>& retVa
lue2) |
2860 { | 2864 { |
2861 RefPtrWillBeRawPtr<CSSValueList> values = nullptr; | 2865 RefPtrWillBeRawPtr<CSSValueList> values = nullptr; |
2862 RefPtrWillBeRawPtr<CSSValueList> values2 = nullptr; | 2866 RefPtrWillBeRawPtr<CSSValueList> values2 = nullptr; |
2863 CSSParserValue* val; | 2867 CSSParserValue* val; |
2864 RefPtrWillBeRawPtr<CSSValue> value = nullptr; | 2868 RefPtrWillBeRawPtr<CSSValue> value = nullptr; |
2865 RefPtrWillBeRawPtr<CSSValue> value2 = nullptr; | 2869 RefPtrWillBeRawPtr<CSSValue> value2 = nullptr; |
(...skipping 5617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8483 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8487 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
8484 if (!seenStroke) | 8488 if (!seenStroke) |
8485 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8489 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
8486 if (!seenMarkers) | 8490 if (!seenMarkers) |
8487 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8491 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
8488 | 8492 |
8489 return parsedValues.release(); | 8493 return parsedValues.release(); |
8490 } | 8494 } |
8491 | 8495 |
8492 } // namespace WebCore | 8496 } // namespace WebCore |
OLD | NEW |