| 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 CSSPropertyBorderStyle: | 271 case CSSPropertyBorderStyle: |
| 272 return get4Values(borderStyleShorthand()); | 272 return get4Values(borderStyleShorthand()); |
| 273 case CSSPropertyFlex: | 273 case CSSPropertyFlex: |
| 274 return getShorthandValue(flexShorthand()); | 274 return getShorthandValue(flexShorthand()); |
| 275 case CSSPropertyFlexFlow: | 275 case CSSPropertyFlexFlow: |
| 276 return getShorthandValue(flexFlowShorthand()); | 276 return getShorthandValue(flexFlowShorthand()); |
| 277 case CSSPropertyFont: | 277 case CSSPropertyFont: |
| 278 return fontValue(); | 278 return fontValue(); |
| 279 case CSSPropertyMargin: | 279 case CSSPropertyMargin: |
| 280 return get4Values(marginShorthand()); | 280 return get4Values(marginShorthand()); |
| 281 case CSSPropertyWebkitMarginCollapse: | |
| 282 return getShorthandValue(webkitMarginCollapseShorthand()); | |
| 283 case CSSPropertyOverflow: | 281 case CSSPropertyOverflow: |
| 284 return getCommonValue(overflowShorthand()); | 282 return getCommonValue(overflowShorthand()); |
| 285 case CSSPropertyPadding: | 283 case CSSPropertyPadding: |
| 286 return get4Values(paddingShorthand()); | 284 return get4Values(paddingShorthand()); |
| 287 case CSSPropertyTransition: | 285 case CSSPropertyTransition: |
| 288 return getLayeredShorthandValue(transitionShorthand()); | 286 return getLayeredShorthandValue(transitionShorthand()); |
| 289 case CSSPropertyListStyle: | 287 case CSSPropertyListStyle: |
| 290 return getShorthandValue(listStyleShorthand()); | 288 return getShorthandValue(listStyleShorthand()); |
| 291 case CSSPropertyWebkitMaskPosition: | 289 case CSSPropertyWebkitMaskPosition: |
| 292 return getLayeredShorthandValue(webkitMaskPositionShorthand()); | 290 return getLayeredShorthandValue(webkitMaskPositionShorthand()); |
| (...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 isInitialValue = false; | 844 isInitialValue = false; |
| 847 if (!value->isInheritedValue()) | 845 if (!value->isInheritedValue()) |
| 848 isInheritedValue = false; | 846 isInheritedValue = false; |
| 849 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 847 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
| 850 return false; | 848 return false; |
| 851 } | 849 } |
| 852 return isInitialValue || isInheritedValue; | 850 return isInitialValue || isInheritedValue; |
| 853 } | 851 } |
| 854 | 852 |
| 855 } | 853 } |
| OLD | NEW |