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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
106 // The system fonts bypass the normal style resolution by using RenderTheme, | 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 | 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. | 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). | 109 // DON'T ADD ANY SHORTHAND HERE UNLESS IT ISN'T ALWAYS EXPANDED AT PARSE TIM E (which is wrong). |
110 if (id == CSSPropertyFont) | 110 if (id == CSSPropertyFont) |
111 return false; | 111 return false; |
112 | 112 |
113 return shorthandForProperty(id).length(); | 113 return shorthandForProperty(id).length(); |
114 } | 114 } |
115 | 115 |
116 bool isExpandedShorthandForAll(CSSPropertyID propertyId) | |
117 { | |
118 // FIXME: isExpandedShorthand says "font" is not an expanded shorthand, | |
119 // but font is expanded to font-family, font-size, and so on. | |
120 // StylePropertySerializer::asText should not generate css text like | |
121 // "font: initial; font-family: initial;...". To avoid this, we need to | |
dglazkov
2014/06/17 15:13:14
This seems like a bug in our code? I remember some
tasak
2014/06/18 05:16:31
Yes. Next I will create StylePropertySerializer pa
| |
122 // treat "font" as an expanded shorthand. | |
123 // And while applying "all" property, we cannot apply "font" property | |
124 // directly. This causes ASSERT crash, because StyleBuilder assume that | |
125 // all given properties are not expanded shorthands. | |
126 // "marker" has the same issue. | |
127 if (propertyId == CSSPropertyMarker || propertyId == CSSPropertyFont) | |
128 return true; | |
129 return shorthandForProperty(propertyId).length(); | |
130 } | |
131 | |
116 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty lePropertyShorthand, 4>& shorthands) | 132 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty lePropertyShorthand, 4>& shorthands) |
117 { | 133 { |
118 for (unsigned i = 0; i < shorthands.size(); ++i) { | 134 for (unsigned i = 0; i < shorthands.size(); ++i) { |
119 if (shorthands.at(i).id() == shorthandID) | 135 if (shorthands.at(i).id() == shorthandID) |
120 return i; | 136 return i; |
121 } | 137 } |
122 ASSERT_NOT_REACHED(); | 138 ASSERT_NOT_REACHED(); |
123 return 0; | 139 return 0; |
124 } | 140 } |
125 | 141 |
126 } // namespace WebCore | 142 } // namespace WebCore |
OLD | NEW |