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

Unified Diff: Source/core/css/StylePropertySerializer.cpp

Issue 1132753002: [CSS Grid Layout] Fix grid shorthands CSSOM serialization (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update test expectations for webexposed/nonstable-css-properties.html Created 5 years, 7 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.h ('k') | no next file » | 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 6b10cccd359038e98a7214aa9e0a17a6192225a1..2a0095a41d56fc5071da4b11ecee5277f8212cab 100644
--- a/Source/core/css/StylePropertySerializer.cpp
+++ b/Source/core/css/StylePropertySerializer.cpp
@@ -417,11 +417,11 @@ String StylePropertySerializer::getPropertyValue(CSSPropertyID propertyID) const
case CSSPropertyFlexFlow:
return getShorthandValue(flexFlowShorthand());
case CSSPropertyGridColumn:
- return getShorthandValue(gridColumnShorthand());
+ return getShorthandValue(gridColumnShorthand(), " / ");
case CSSPropertyGridRow:
- return getShorthandValue(gridRowShorthand());
+ return getShorthandValue(gridRowShorthand(), " / ");
case CSSPropertyGridArea:
- return getShorthandValue(gridAreaShorthand());
+ return getShorthandValue(gridAreaShorthand(), " / ");
case CSSPropertyFont:
return fontValue();
case CSSPropertyMargin:
@@ -751,7 +751,7 @@ String StylePropertySerializer::getLayeredShorthandValue(const StylePropertyShor
return result.toString();
}
-String StylePropertySerializer::getShorthandValue(const StylePropertyShorthand& shorthand) const
+String StylePropertySerializer::getShorthandValue(const StylePropertyShorthand& shorthand, String separator) const
{
String commonValue;
StringBuilder result;
@@ -768,7 +768,7 @@ String StylePropertySerializer::getShorthandValue(const StylePropertyShorthand&
if (value->isInitialValue())
continue;
if (!result.isEmpty())
- result.append(' ');
+ result.append(separator);
result.append(valueText);
} else
commonValue = String();
« no previous file with comments | « Source/core/css/StylePropertySerializer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698