| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 break; | 132 break; |
| 133 case CSSPropertyFontFamily: | 133 case CSSPropertyFontFamily: |
| 134 case CSSPropertyLineHeight: | 134 case CSSPropertyLineHeight: |
| 135 case CSSPropertyFontSize: | 135 case CSSPropertyFontSize: |
| 136 case CSSPropertyFontStretch: | 136 case CSSPropertyFontStretch: |
| 137 case CSSPropertyFontStyle: | 137 case CSSPropertyFontStyle: |
| 138 case CSSPropertyFontVariant: | 138 case CSSPropertyFontVariant: |
| 139 case CSSPropertyFontWeight: | 139 case CSSPropertyFontWeight: |
| 140 // Don't use CSSPropertyFont because old UAs can't recognize them bu
t are important for editing. | 140 // Don't use CSSPropertyFont because old UAs can't recognize them bu
t are important for editing. |
| 141 break; | 141 break; |
| 142 case CSSPropertyListStyleType: | |
| 143 case CSSPropertyListStylePosition: | |
| 144 case CSSPropertyListStyleImage: | |
| 145 shorthandPropertyID = CSSPropertyListStyle; | |
| 146 break; | |
| 147 case CSSPropertyMarginTop: | 142 case CSSPropertyMarginTop: |
| 148 case CSSPropertyMarginRight: | 143 case CSSPropertyMarginRight: |
| 149 case CSSPropertyMarginBottom: | 144 case CSSPropertyMarginBottom: |
| 150 case CSSPropertyMarginLeft: | 145 case CSSPropertyMarginLeft: |
| 151 shorthandPropertyID = CSSPropertyMargin; | 146 shorthandPropertyID = CSSPropertyMargin; |
| 152 break; | 147 break; |
| 153 case CSSPropertyOutlineWidth: | 148 case CSSPropertyOutlineWidth: |
| 154 case CSSPropertyOutlineStyle: | 149 case CSSPropertyOutlineStyle: |
| 155 case CSSPropertyOutlineColor: | 150 case CSSPropertyOutlineColor: |
| 156 shorthandPropertyID = CSSPropertyOutline; | 151 shorthandPropertyID = CSSPropertyOutline; |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 case CSSPropertyFont: | 253 case CSSPropertyFont: |
| 259 return fontValue(); | 254 return fontValue(); |
| 260 case CSSPropertyMargin: | 255 case CSSPropertyMargin: |
| 261 return get4Values(marginShorthand()); | 256 return get4Values(marginShorthand()); |
| 262 case CSSPropertyOverflow: | 257 case CSSPropertyOverflow: |
| 263 return getCommonValue(overflowShorthand()); | 258 return getCommonValue(overflowShorthand()); |
| 264 case CSSPropertyPadding: | 259 case CSSPropertyPadding: |
| 265 return get4Values(paddingShorthand()); | 260 return get4Values(paddingShorthand()); |
| 266 case CSSPropertyTransition: | 261 case CSSPropertyTransition: |
| 267 return getLayeredShorthandValue(transitionShorthand()); | 262 return getLayeredShorthandValue(transitionShorthand()); |
| 268 case CSSPropertyListStyle: | |
| 269 return getShorthandValue(listStyleShorthand()); | |
| 270 case CSSPropertyWebkitTextEmphasis: | 263 case CSSPropertyWebkitTextEmphasis: |
| 271 return getShorthandValue(webkitTextEmphasisShorthand()); | 264 return getShorthandValue(webkitTextEmphasisShorthand()); |
| 272 case CSSPropertyWebkitTextStroke: | 265 case CSSPropertyWebkitTextStroke: |
| 273 return getShorthandValue(webkitTextStrokeShorthand()); | 266 return getShorthandValue(webkitTextStrokeShorthand()); |
| 274 case CSSPropertyTransformOrigin: | 267 case CSSPropertyTransformOrigin: |
| 275 case CSSPropertyWebkitTransformOrigin: | 268 case CSSPropertyWebkitTransformOrigin: |
| 276 return getShorthandValue(webkitTransformOriginShorthand()); | 269 return getShorthandValue(webkitTransformOriginShorthand()); |
| 277 case CSSPropertyBorderRadius: | 270 case CSSPropertyBorderRadius: |
| 278 return get4Values(borderRadiusShorthand()); | 271 return get4Values(borderRadiusShorthand()); |
| 279 default: | 272 default: |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 return false; | 783 return false; |
| 791 if (!value->isInitialValue()) | 784 if (!value->isInitialValue()) |
| 792 isInitialValue = false; | 785 isInitialValue = false; |
| 793 if (!value->isInheritedValue()) | 786 if (!value->isInheritedValue()) |
| 794 isInheritedValue = false; | 787 isInheritedValue = false; |
| 795 } | 788 } |
| 796 return isInitialValue || isInheritedValue; | 789 return isInitialValue || isInheritedValue; |
| 797 } | 790 } |
| 798 | 791 |
| 799 } | 792 } |
| OLD | NEW |