| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 return transitionShorthandForParsing(); | 125 return transitionShorthandForParsing(); |
| 126 case CSSPropertyWebkitTransition: | 126 case CSSPropertyWebkitTransition: |
| 127 return webkitTransitionShorthandForParsing(); | 127 return webkitTransitionShorthandForParsing(); |
| 128 default: | 128 default: |
| 129 return shorthandForProperty(propertyID); | 129 return shorthandForProperty(propertyID); |
| 130 } | 130 } |
| 131 } | 131 } |
| 132 | 132 |
| 133 bool isExpandedShorthand(CSSPropertyID id) | 133 bool isExpandedShorthand(CSSPropertyID id) |
| 134 { | 134 { |
| 135 // The system fonts bypass the normal style resolution by using RenderTheme, | |
| 136 // thus we need to special case it here. FIXME: This is a violation of CSS 3
Fonts | |
| 137 // as we should still be able to change the longhands. | |
| 138 // DON'T ADD ANY SHORTHAND HERE UNLESS IT ISN'T ALWAYS EXPANDED AT PARSE TIM
E (which is wrong). | |
| 139 if (id == CSSPropertyFont) | |
| 140 return false; | |
| 141 | |
| 142 return shorthandForProperty(id).length(); | 135 return shorthandForProperty(id).length(); |
| 143 } | 136 } |
| 144 | 137 |
| 145 bool isExpandedShorthandForAll(CSSPropertyID propertyId) | |
| 146 { | |
| 147 // FIXME: isExpandedShorthand says "font" is not an expanded shorthand, | |
| 148 // but font is expanded to font-family, font-size, and so on. | |
| 149 // StylePropertySerializer::asText should not generate css text like | |
| 150 // "font: initial; font-family: initial;...". To avoid this, we need to | |
| 151 // treat "font" as an expanded shorthand. | |
| 152 // And while applying "all" property, we cannot apply "font" property | |
| 153 // directly. This causes ASSERT crash, because StyleBuilder assume that | |
| 154 // all given properties are not expanded shorthands. | |
| 155 if (propertyId == CSSPropertyFont) | |
| 156 return true; | |
| 157 return shorthandForProperty(propertyId).length(); | |
| 158 } | |
| 159 | |
| 160 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty
lePropertyShorthand, 4>& shorthands) | 138 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty
lePropertyShorthand, 4>& shorthands) |
| 161 { | 139 { |
| 162 for (unsigned i = 0; i < shorthands.size(); ++i) { | 140 for (unsigned i = 0; i < shorthands.size(); ++i) { |
| 163 if (shorthands.at(i).id() == shorthandID) | 141 if (shorthands.at(i).id() == shorthandID) |
| 164 return i; | 142 return i; |
| 165 } | 143 } |
| 166 ASSERT_NOT_REACHED(); | 144 ASSERT_NOT_REACHED(); |
| 167 return 0; | 145 return 0; |
| 168 } | 146 } |
| 169 | 147 |
| 170 } // namespace blink | 148 } // namespace blink |
| OLD | NEW |