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 Apple Computer, Inc. | 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
666 case CSSPropertyInvalid: | 666 case CSSPropertyInvalid: |
667 ASSERT_NOT_REACHED(); | 667 ASSERT_NOT_REACHED(); |
668 return false; | 668 return false; |
669 } | 669 } |
670 ASSERT_NOT_REACHED(); | 670 ASSERT_NOT_REACHED(); |
671 return false; | 671 return false; |
672 } | 672 } |
673 | 673 |
674 bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID) | 674 bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID) |
675 { | 675 { |
676 if (propertyID == CSSPropertyAll) | |
677 return false; | |
678 | |
679 // all shorthand spec says: | 676 // all shorthand spec says: |
680 // The all property is a shorthand that resets all CSS properties except | 677 // The all property is a shorthand that resets all CSS properties except |
681 // direction and unicode-bidi. It only accepts the CSS-wide keywords. | 678 // direction and unicode-bidi. It only accepts the CSS-wide keywords. |
682 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand | 679 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand |
683 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not | 680 return propertyID != CSSPropertyAll |
684 // affected by all property. | 681 && propertyID != CSSPropertyUnicodeBidi |
685 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire
ction; | 682 && propertyID != CSSPropertyDirection |
| 683 && propertyID != CSSPropertyInternalCallback |
| 684 && !isExpandedShorthandForAll(propertyID); |
686 } | 685 } |
687 | 686 |
688 } // namespace blink | 687 } // namespace blink |
OLD | NEW |