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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 case CSSPropertyFlex: | 421 case CSSPropertyFlex: |
422 return getShorthandValue(flexShorthand()); | 422 return getShorthandValue(flexShorthand()); |
423 case CSSPropertyFlexFlow: | 423 case CSSPropertyFlexFlow: |
424 return getShorthandValue(flexFlowShorthand()); | 424 return getShorthandValue(flexFlowShorthand()); |
425 case CSSPropertyGridColumn: | 425 case CSSPropertyGridColumn: |
426 return getShorthandValue(gridColumnShorthand(), " / "); | 426 return getShorthandValue(gridColumnShorthand(), " / "); |
427 case CSSPropertyGridRow: | 427 case CSSPropertyGridRow: |
428 return getShorthandValue(gridRowShorthand(), " / "); | 428 return getShorthandValue(gridRowShorthand(), " / "); |
429 case CSSPropertyGridArea: | 429 case CSSPropertyGridArea: |
430 return getShorthandValue(gridAreaShorthand(), " / "); | 430 return getShorthandValue(gridAreaShorthand(), " / "); |
| 431 case CSSPropertyGridGap: |
| 432 return getShorthandValue(gridGapShorthand()); |
431 case CSSPropertyFont: | 433 case CSSPropertyFont: |
432 return fontValue(); | 434 return fontValue(); |
433 case CSSPropertyMargin: | 435 case CSSPropertyMargin: |
434 return get4Values(marginShorthand()); | 436 return get4Values(marginShorthand()); |
435 case CSSPropertyMotion: | 437 case CSSPropertyMotion: |
436 return getShorthandValue(motionShorthand()); | 438 return getShorthandValue(motionShorthand()); |
437 case CSSPropertyWebkitMarginCollapse: | 439 case CSSPropertyWebkitMarginCollapse: |
438 return getShorthandValue(webkitMarginCollapseShorthand()); | 440 return getShorthandValue(webkitMarginCollapseShorthand()); |
439 case CSSPropertyOverflow: | 441 case CSSPropertyOverflow: |
440 return getCommonValue(overflowShorthand()); | 442 return getCommonValue(overflowShorthand()); |
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
969 isInitialValue = false; | 971 isInitialValue = false; |
970 if (!value->isInheritedValue()) | 972 if (!value->isInheritedValue()) |
971 isInheritedValue = false; | 973 isInheritedValue = false; |
972 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 974 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
973 return false; | 975 return false; |
974 } | 976 } |
975 return isInitialValue || isInheritedValue; | 977 return isInitialValue || isInheritedValue; |
976 } | 978 } |
977 | 979 |
978 } | 980 } |
OLD | NEW |