OLD | NEW |
1 /* | 1 /* |
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) | 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r
ights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r
ights reserved. |
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. | 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. |
5 * Copyright (C) 2013 Intel Corporation. All rights reserved. | 5 * Copyright (C) 2013 Intel Corporation. All rights reserved. |
6 * | 6 * |
7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 value = borderPropertyValue(ReturnNullOnUncommonValues); | 116 value = borderPropertyValue(ReturnNullOnUncommonValues); |
117 if (value.isNull()) | 117 if (value.isNull()) |
118 shorthandPropertyAppeared.set(CSSPropertyBorder - firstCSSPr
operty); | 118 shorthandPropertyAppeared.set(CSSPropertyBorder - firstCSSPr
operty); |
119 else | 119 else |
120 shorthandPropertyID = CSSPropertyBorder; | 120 shorthandPropertyID = CSSPropertyBorder; |
121 } else if (shorthandPropertyUsed.get(CSSPropertyBorder - firstCSSPro
perty)) | 121 } else if (shorthandPropertyUsed.get(CSSPropertyBorder - firstCSSPro
perty)) |
122 shorthandPropertyID = CSSPropertyBorder; | 122 shorthandPropertyID = CSSPropertyBorder; |
123 if (!shorthandPropertyID) | 123 if (!shorthandPropertyID) |
124 shorthandPropertyID = borderFallbackShorthandProperty; | 124 shorthandPropertyID = borderFallbackShorthandProperty; |
125 break; | 125 break; |
| 126 case CSSPropertyBorderTopLeftRadius: |
| 127 case CSSPropertyBorderTopRightRadius: |
| 128 case CSSPropertyBorderBottomLeftRadius: |
| 129 case CSSPropertyBorderBottomRightRadius: |
| 130 shorthandPropertyID = CSSPropertyBorderRadius; |
| 131 break; |
126 case CSSPropertyWebkitBorderHorizontalSpacing: | 132 case CSSPropertyWebkitBorderHorizontalSpacing: |
127 case CSSPropertyWebkitBorderVerticalSpacing: | 133 case CSSPropertyWebkitBorderVerticalSpacing: |
128 shorthandPropertyID = CSSPropertyBorderSpacing; | 134 shorthandPropertyID = CSSPropertyBorderSpacing; |
129 break; | 135 break; |
130 case CSSPropertyFontFamily: | 136 case CSSPropertyFontFamily: |
131 case CSSPropertyLineHeight: | 137 case CSSPropertyLineHeight: |
132 case CSSPropertyFontSize: | 138 case CSSPropertyFontSize: |
133 case CSSPropertyFontStretch: | 139 case CSSPropertyFontStretch: |
134 case CSSPropertyFontStyle: | 140 case CSSPropertyFontStyle: |
135 case CSSPropertyFontVariant: | 141 case CSSPropertyFontVariant: |
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
866 isInitialValue = false; | 872 isInitialValue = false; |
867 if (!value->isInheritedValue()) | 873 if (!value->isInheritedValue()) |
868 isInheritedValue = false; | 874 isInheritedValue = false; |
869 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 875 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
870 return false; | 876 return false; |
871 } | 877 } |
872 return isInitialValue || isInheritedValue; | 878 return isInitialValue || isInheritedValue; |
873 } | 879 } |
874 | 880 |
875 } | 881 } |
OLD | NEW |