| 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 case CSSPropertyBorderColor: | 271 case CSSPropertyBorderColor: |
| 272 return get4Values(borderColorShorthand()); | 272 return get4Values(borderColorShorthand()); |
| 273 case CSSPropertyBorderWidth: | 273 case CSSPropertyBorderWidth: |
| 274 return get4Values(borderWidthShorthand()); | 274 return get4Values(borderWidthShorthand()); |
| 275 case CSSPropertyBorderStyle: | 275 case CSSPropertyBorderStyle: |
| 276 return get4Values(borderStyleShorthand()); | 276 return get4Values(borderStyleShorthand()); |
| 277 case CSSPropertyFlex: | 277 case CSSPropertyFlex: |
| 278 return getShorthandValue(flexShorthand()); | 278 return getShorthandValue(flexShorthand()); |
| 279 case CSSPropertyFlexFlow: | 279 case CSSPropertyFlexFlow: |
| 280 return getShorthandValue(flexFlowShorthand()); | 280 return getShorthandValue(flexFlowShorthand()); |
| 281 case CSSPropertyGridColumn: | |
| 282 return getShorthandValue(gridColumnShorthand()); | |
| 283 case CSSPropertyGridRow: | |
| 284 return getShorthandValue(gridRowShorthand()); | |
| 285 case CSSPropertyGridArea: | |
| 286 return getShorthandValue(gridAreaShorthand()); | |
| 287 case CSSPropertyFont: | 281 case CSSPropertyFont: |
| 288 return fontValue(); | 282 return fontValue(); |
| 289 case CSSPropertyMargin: | 283 case CSSPropertyMargin: |
| 290 return get4Values(marginShorthand()); | 284 return get4Values(marginShorthand()); |
| 291 case CSSPropertyWebkitMarginCollapse: | 285 case CSSPropertyWebkitMarginCollapse: |
| 292 return getShorthandValue(webkitMarginCollapseShorthand()); | 286 return getShorthandValue(webkitMarginCollapseShorthand()); |
| 293 case CSSPropertyOverflow: | 287 case CSSPropertyOverflow: |
| 294 return getCommonValue(overflowShorthand()); | 288 return getCommonValue(overflowShorthand()); |
| 295 case CSSPropertyPadding: | 289 case CSSPropertyPadding: |
| 296 return get4Values(paddingShorthand()); | 290 return get4Values(paddingShorthand()); |
| (...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 isInitialValue = false; | 850 isInitialValue = false; |
| 857 if (!value->isInheritedValue()) | 851 if (!value->isInheritedValue()) |
| 858 isInheritedValue = false; | 852 isInheritedValue = false; |
| 859 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 853 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
| 860 return false; | 854 return false; |
| 861 } | 855 } |
| 862 return isInitialValue || isInheritedValue; | 856 return isInitialValue || isInheritedValue; |
| 863 } | 857 } |
| 864 | 858 |
| 865 } | 859 } |
| OLD | NEW |