| 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 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2013 Intel Corporation. All rights reserved. | 4 * Copyright (C) 2013 Intel Corporation. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 return borderShorthandForParsing(); | 96 return borderShorthandForParsing(); |
| 97 case CSSPropertyWebkitAnimation: | 97 case CSSPropertyWebkitAnimation: |
| 98 return webkitAnimationShorthandForParsing(); | 98 return webkitAnimationShorthandForParsing(); |
| 99 default: | 99 default: |
| 100 return shorthandForProperty(propertyID); | 100 return shorthandForProperty(propertyID); |
| 101 } | 101 } |
| 102 } | 102 } |
| 103 | 103 |
| 104 bool isExpandedShorthand(CSSPropertyID id) | 104 bool isExpandedShorthand(CSSPropertyID id) |
| 105 { | 105 { |
| 106 // The system fonts bypass the normal style resolution by using RenderTheme, | |
| 107 // thus we need to special case it here. FIXME: This is a violation of CSS 3
Fonts | |
| 108 // as we should still be able to change the longhands. | |
| 109 // DON'T ADD ANY SHORTHAND HERE UNLESS IT ISN'T ALWAYS EXPANDED AT PARSE TIM
E (which is wrong). | |
| 110 if (id == CSSPropertyFont) | |
| 111 return false; | |
| 112 | |
| 113 return shorthandForProperty(id).length(); | 106 return shorthandForProperty(id).length(); |
| 114 } | 107 } |
| 115 | 108 |
| 116 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty
lePropertyShorthand, 4>& shorthands) | 109 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty
lePropertyShorthand, 4>& shorthands) |
| 117 { | 110 { |
| 118 for (unsigned i = 0; i < shorthands.size(); ++i) { | 111 for (unsigned i = 0; i < shorthands.size(); ++i) { |
| 119 if (shorthands.at(i).id() == shorthandID) | 112 if (shorthands.at(i).id() == shorthandID) |
| 120 return i; | 113 return i; |
| 121 } | 114 } |
| 122 ASSERT_NOT_REACHED(); | 115 ASSERT_NOT_REACHED(); |
| 123 return 0; | 116 return 0; |
| 124 } | 117 } |
| 125 | 118 |
| 126 } // namespace WebCore | 119 } // namespace WebCore |
| OLD | NEW |