| 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 case CSSPropertyBorderLeft: | 428 case CSSPropertyBorderLeft: |
| 429 return getShorthandValue(borderLeftShorthand()); | 429 return getShorthandValue(borderLeftShorthand()); |
| 430 case CSSPropertyOutline: | 430 case CSSPropertyOutline: |
| 431 return getShorthandValue(outlineShorthand()); | 431 return getShorthandValue(outlineShorthand()); |
| 432 case CSSPropertyBorderColor: | 432 case CSSPropertyBorderColor: |
| 433 return get4Values(borderColorShorthand()); | 433 return get4Values(borderColorShorthand()); |
| 434 case CSSPropertyBorderWidth: | 434 case CSSPropertyBorderWidth: |
| 435 return get4Values(borderWidthShorthand()); | 435 return get4Values(borderWidthShorthand()); |
| 436 case CSSPropertyBorderStyle: | 436 case CSSPropertyBorderStyle: |
| 437 return get4Values(borderStyleShorthand()); | 437 return get4Values(borderStyleShorthand()); |
| 438 case CSSPropertyWebkitColumnRule: | 438 case CSSPropertyColumnRule: |
| 439 return getShorthandValue(webkitColumnRuleShorthand()); | 439 return getShorthandValue(columnRuleShorthand()); |
| 440 case CSSPropertyWebkitColumns: | 440 case CSSPropertyColumns: |
| 441 return getShorthandValue(webkitColumnsShorthand()); | 441 return getShorthandValue(columnsShorthand()); |
| 442 case CSSPropertyFlex: | 442 case CSSPropertyFlex: |
| 443 return getShorthandValue(flexShorthand()); | 443 return getShorthandValue(flexShorthand()); |
| 444 case CSSPropertyFlexFlow: | 444 case CSSPropertyFlexFlow: |
| 445 return getShorthandValue(flexFlowShorthand()); | 445 return getShorthandValue(flexFlowShorthand()); |
| 446 case CSSPropertyGridColumn: | 446 case CSSPropertyGridColumn: |
| 447 return getShorthandValue(gridColumnShorthand(), " / "); | 447 return getShorthandValue(gridColumnShorthand(), " / "); |
| 448 case CSSPropertyGridRow: | 448 case CSSPropertyGridRow: |
| 449 return getShorthandValue(gridRowShorthand(), " / "); | 449 return getShorthandValue(gridRowShorthand(), " / "); |
| 450 case CSSPropertyGridArea: | 450 case CSSPropertyGridArea: |
| 451 return getShorthandValue(gridAreaShorthand(), " / "); | 451 return getShorthandValue(gridAreaShorthand(), " / "); |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 996 isInitialValue = false; | 996 isInitialValue = false; |
| 997 if (!value->isInheritedValue()) | 997 if (!value->isInheritedValue()) |
| 998 isInheritedValue = false; | 998 isInheritedValue = false; |
| 999 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) | 999 if (isImportant != m_propertySet.propertyIsImportant(shorthand.propertie
s()[i])) |
| 1000 return false; | 1000 return false; |
| 1001 } | 1001 } |
| 1002 return isInitialValue || isInheritedValue; | 1002 return isInitialValue || isInheritedValue; |
| 1003 } | 1003 } |
| 1004 | 1004 |
| 1005 } // namespace blink | 1005 } // namespace blink |
| OLD | NEW |