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

Unified Diff: Source/core/css/StylePropertySerializer.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/CSSProperties.in ('k') | Source/core/css/StylePropertyShorthandCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/StylePropertySerializer.cpp
diff --git a/Source/core/css/StylePropertySerializer.cpp b/Source/core/css/StylePropertySerializer.cpp
index f6786b144bd3a299a665079b1e6b6ba0343db81b..2ab90365b1bce048eb6b203c6c012df984e52677 100644
--- a/Source/core/css/StylePropertySerializer.cpp
+++ b/Source/core/css/StylePropertySerializer.cpp
@@ -122,7 +122,7 @@ bool StylePropertySerializer::StylePropertySetForSerializer::shouldProcessProper
// Since "all" is expanded, we don't need to process "all".
// We should not process expanded shorthands (e.g. font, background,
// and so on) either.
- if (isExpandedShorthandForAll(propertyID) || propertyID == CSSPropertyAll)
+ if (isExpandedShorthand(propertyID) || propertyID == CSSPropertyAll)
return false;
// We should not serialize internal properties.
if (isInternalProperty(propertyID))
@@ -221,7 +221,7 @@ String StylePropertySerializer::asText() const
CSSPropertyID shorthandPropertyID = CSSPropertyInvalid;
CSSPropertyID borderFallbackShorthandProperty = CSSPropertyInvalid;
String value;
- ASSERT(!isExpandedShorthandForAll(propertyID));
+ ASSERT(!isExpandedShorthand(propertyID));
switch (propertyID) {
case CSSPropertyBackgroundAttachment:
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/StylePropertyShorthandCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698