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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 bool isExpandedShorthandForAll(CSSPropertyID propertyId) | 145 bool isExpandedShorthandForAll(CSSPropertyID propertyId) |
146 { | 146 { |
147 // FIXME: isExpandedShorthand says "font" is not an expanded shorthand, | 147 // FIXME: isExpandedShorthand says "font" is not an expanded shorthand, |
148 // but font is expanded to font-family, font-size, and so on. | 148 // but font is expanded to font-family, font-size, and so on. |
149 // StylePropertySerializer::asText should not generate css text like | 149 // StylePropertySerializer::asText should not generate css text like |
150 // "font: initial; font-family: initial;...". To avoid this, we need to | 150 // "font: initial; font-family: initial;...". To avoid this, we need to |
151 // treat "font" as an expanded shorthand. | 151 // treat "font" as an expanded shorthand. |
152 // And while applying "all" property, we cannot apply "font" property | 152 // And while applying "all" property, we cannot apply "font" property |
153 // directly. This causes ASSERT crash, because StyleBuilder assume that | 153 // directly. This causes ASSERT crash, because StyleBuilder assume that |
154 // all given properties are not expanded shorthands. | 154 // all given properties are not expanded shorthands. |
155 // "marker" has the same issue. | 155 if (propertyId == CSSPropertyFont) |
156 if (propertyId == CSSPropertyMarker || propertyId == CSSPropertyFont) | |
157 return true; | 156 return true; |
158 return shorthandForProperty(propertyId).length(); | 157 return shorthandForProperty(propertyId).length(); |
159 } | 158 } |
160 | 159 |
161 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty
lePropertyShorthand, 4>& shorthands) | 160 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty
lePropertyShorthand, 4>& shorthands) |
162 { | 161 { |
163 for (unsigned i = 0; i < shorthands.size(); ++i) { | 162 for (unsigned i = 0; i < shorthands.size(); ++i) { |
164 if (shorthands.at(i).id() == shorthandID) | 163 if (shorthands.at(i).id() == shorthandID) |
165 return i; | 164 return i; |
166 } | 165 } |
167 ASSERT_NOT_REACHED(); | 166 ASSERT_NOT_REACHED(); |
168 return 0; | 167 return 0; |
169 } | 168 } |
170 | 169 |
171 } // namespace blink | 170 } // namespace blink |
OLD | NEW |