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 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
720 case CSSPropertyWebkitMaskSize: | 720 case CSSPropertyWebkitMaskSize: |
721 case CSSPropertyWebkitMaskRepeat: | 721 case CSSPropertyWebkitMaskRepeat: |
722 case CSSPropertyWebkitMaskRepeatX: | 722 case CSSPropertyWebkitMaskRepeatX: |
723 case CSSPropertyWebkitMaskRepeatY: | 723 case CSSPropertyWebkitMaskRepeatY: |
724 { | 724 { |
725 RefPtrWillBeRawPtr<CSSValue> val1 = nullptr; | 725 RefPtrWillBeRawPtr<CSSValue> val1 = nullptr; |
726 RefPtrWillBeRawPtr<CSSValue> val2 = nullptr; | 726 RefPtrWillBeRawPtr<CSSValue> val2 = nullptr; |
727 CSSPropertyID propId1, propId2; | 727 CSSPropertyID propId1, propId2; |
728 bool result = false; | 728 bool result = false; |
729 if (parseFillProperty(propId, propId1, propId2, val1, val2)) { | 729 if (parseFillProperty(propId, propId1, propId2, val1, val2)) { |
730 OwnPtr<ShorthandScope> shorthandScope; | |
731 if (propId == CSSPropertyBackgroundPosition || | 730 if (propId == CSSPropertyBackgroundPosition || |
732 propId == CSSPropertyBackgroundRepeat || | 731 propId == CSSPropertyBackgroundRepeat || |
733 propId == CSSPropertyWebkitMaskPosition || | 732 propId == CSSPropertyWebkitMaskPosition || |
734 propId == CSSPropertyWebkitMaskRepeat) { | 733 propId == CSSPropertyWebkitMaskRepeat) { |
735 shorthandScope = adoptPtr(new ShorthandScope(this, propId)); | 734 ShorthandScope scope(this, propId); |
| 735 addProperty(propId1, val1.release(), important); |
| 736 if (val2) |
| 737 addProperty(propId2, val2.release(), important); |
| 738 } else { |
| 739 addProperty(propId1, val1.release(), important); |
| 740 if (val2) |
| 741 addProperty(propId2, val2.release(), important); |
736 } | 742 } |
737 addProperty(propId1, val1.release(), important); | |
738 if (val2) | |
739 addProperty(propId2, val2.release(), important); | |
740 result = true; | 743 result = true; |
741 } | 744 } |
742 m_implicitShorthand = false; | 745 m_implicitShorthand = false; |
743 return result; | 746 return result; |
744 } | 747 } |
745 case CSSPropertyObjectPosition: | 748 case CSSPropertyObjectPosition: |
746 return RuntimeEnabledFeatures::objectFitPositionEnabled() && parseObject
Position(important); | 749 return RuntimeEnabledFeatures::objectFitPositionEnabled() && parseObject
Position(important); |
747 case CSSPropertyListStyleImage: // <uri> | none | inherit | 750 case CSSPropertyListStyleImage: // <uri> | none | inherit |
748 case CSSPropertyBorderImageSource: | 751 case CSSPropertyBorderImageSource: |
749 case CSSPropertyWebkitMaskBoxImageSource: | 752 case CSSPropertyWebkitMaskBoxImageSource: |
(...skipping 7487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
8237 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); | 8240 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); |
8238 if (!seenStroke) | 8241 if (!seenStroke) |
8239 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); | 8242 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke)
); |
8240 if (!seenMarkers) | 8243 if (!seenMarkers) |
8241 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); | 8244 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers
)); |
8242 | 8245 |
8243 return parsedValues.release(); | 8246 return parsedValues.release(); |
8244 } | 8247 } |
8245 | 8248 |
8246 } // namespace WebCore | 8249 } // namespace WebCore |
OLD | NEW |