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

Unified 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: Remove isExpandedShorthandForAll. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/StylePropertySerializer.cpp ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/StylePropertyShorthandCustom.cpp
diff --git a/Source/core/css/StylePropertyShorthandCustom.cpp b/Source/core/css/StylePropertyShorthandCustom.cpp
index 66c19c67ce1dc8baa10c6e11392bb7bfa0025b44..818bec3188f3cccbb9a221babce8ce61dfff4b3a 100644
--- a/Source/core/css/StylePropertyShorthandCustom.cpp
+++ b/Source/core/css/StylePropertyShorthandCustom.cpp
@@ -132,31 +132,9 @@ const StylePropertyShorthand& parsingShorthandForProperty(CSSPropertyID property
bool isExpandedShorthand(CSSPropertyID id)
{
- // The system fonts bypass the normal style resolution by using RenderTheme,
- // thus we need to special case it here. FIXME: This is a violation of CSS 3 Fonts
- // as we should still be able to change the longhands.
- // DON'T ADD ANY SHORTHAND HERE UNLESS IT ISN'T ALWAYS EXPANDED AT PARSE TIME (which is wrong).
- if (id == CSSPropertyFont)
- return false;
-
return shorthandForProperty(id).length();
}
-bool isExpandedShorthandForAll(CSSPropertyID propertyId)
-{
- // FIXME: isExpandedShorthand says "font" is not an expanded shorthand,
- // but font is expanded to font-family, font-size, and so on.
- // StylePropertySerializer::asText should not generate css text like
- // "font: initial; font-family: initial;...". To avoid this, we need to
- // treat "font" as an expanded shorthand.
- // And while applying "all" property, we cannot apply "font" property
- // directly. This causes ASSERT crash, because StyleBuilder assume that
- // all given properties are not expanded shorthands.
- if (propertyId == CSSPropertyFont)
- return true;
- return shorthandForProperty(propertyId).length();
-}
-
unsigned indexOfShorthandForLonghand(CSSPropertyID shorthandID, const Vector<StylePropertyShorthand, 4>& shorthands)
{
for (unsigned i = 0; i < shorthands.size(); ++i) {
« no previous file with comments | « Source/core/css/StylePropertySerializer.cpp ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698