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 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
678 case CSSPropertyInvalid: | 678 case CSSPropertyInvalid: |
679 ASSERT_NOT_REACHED(); | 679 ASSERT_NOT_REACHED(); |
680 return false; | 680 return false; |
681 } | 681 } |
682 ASSERT_NOT_REACHED(); | 682 ASSERT_NOT_REACHED(); |
683 return false; | 683 return false; |
684 } | 684 } |
685 | 685 |
686 bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID) | 686 bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID) |
687 { | 687 { |
688 if (propertyID == CSSPropertyAll) | |
689 return false; | |
690 | |
691 // all shorthand spec says: | 688 // all shorthand spec says: |
692 // The all property is a shorthand that resets all CSS properties except | 689 // The all property is a shorthand that resets all CSS properties except |
693 // direction and unicode-bidi. It only accepts the CSS-wide keywords. | 690 // direction and unicode-bidi. It only accepts the CSS-wide keywords. |
694 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand | 691 // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand |
695 // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not | 692 return propertyID != CSSPropertyAll |
696 // affected by all property. | 693 && propertyID != CSSPropertyUnicodeBidi |
697 return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDire
ction; | 694 && propertyID != CSSPropertyDirection |
| 695 && propertyID != CSSPropertyInternalCallback |
| 696 && !isExpandedShorthandForAll(propertyID); |
698 } | 697 } |
699 | 698 |
700 } // namespace WebCore | 699 } // namespace WebCore |
OLD | NEW |