Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2033)

Side by Side Diff: Source/core/css/StylePropertyShorthandCustom.cpp

Issue 677103002: Expand system font values during property parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: OVERRIDE -> override, Allow CSSValueNone in systemFont() Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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) 138 bool isExpandedShorthandForAll(CSSPropertyID propertyId)
Timothy Loh 2014/10/27 05:45:46 I think we can remove this function and just call
andersr 2014/10/27 10:58:29 Done.
146 { 139 {
147 // FIXME: isExpandedShorthand says "font" is not an expanded shorthand, 140 // FIXME: isExpandedShorthand says "font" is not an expanded shorthand,
148 // but font is expanded to font-family, font-size, and so on. 141 // but font is expanded to font-family, font-size, and so on.
149 // StylePropertySerializer::asText should not generate css text like 142 // StylePropertySerializer::asText should not generate css text like
150 // "font: initial; font-family: initial;...". To avoid this, we need to 143 // "font: initial; font-family: initial;...". To avoid this, we need to
151 // treat "font" as an expanded shorthand. 144 // treat "font" as an expanded shorthand.
152 // And while applying "all" property, we cannot apply "font" property 145 // And while applying "all" property, we cannot apply "font" property
153 // directly. This causes ASSERT crash, because StyleBuilder assume that 146 // directly. This causes ASSERT crash, because StyleBuilder assume that
154 // all given properties are not expanded shorthands. 147 // all given properties are not expanded shorthands.
155 // "marker" has the same issue. 148 // "marker" has the same issue.
156 if (propertyId == CSSPropertyMarker || propertyId == CSSPropertyFont) 149 if (propertyId == CSSPropertyMarker || propertyId == CSSPropertyFont)
157 return true; 150 return true;
158 return shorthandForProperty(propertyId).length(); 151 return shorthandForProperty(propertyId).length();
159 } 152 }
160 153
161 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty lePropertyShorthand, 4>& shorthands) 154 unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<Sty lePropertyShorthand, 4>& shorthands)
162 { 155 {
163 for (unsigned i = 0; i < shorthands.size(); ++i) { 156 for (unsigned i = 0; i < shorthands.size(); ++i) {
164 if (shorthands.at(i).id() == shorthandID) 157 if (shorthands.at(i).id() == shorthandID)
165 return i; 158 return i;
166 } 159 }
167 ASSERT_NOT_REACHED(); 160 ASSERT_NOT_REACHED();
168 return 0; 161 return 0;
169 } 162 }
170 163
171 } // namespace blink 164 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698