Source/core/css/LayoutStyleCSSValueMapping.cpp - Issue 973623002: Fix serialization of content property to always quote

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

Issue 973623002: Fix serialization of content property to always quote (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix final test Created 5 years, 10 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

Index: Source/core/css/LayoutStyleCSSValueMapping.cpp

diff --git a/Source/core/css/LayoutStyleCSSValueMapping.cpp b/Source/core/css/LayoutStyleCSSValueMapping.cpp

index cd0f725c2170155e1fbb335aaf7bd5a4d4b8d5d4..e85dd4191466bdec78c7f960da4a57759e196bb5 100644

--- a/Source/core/css/LayoutStyleCSSValueMapping.cpp

+++ b/Source/core/css/LayoutStyleCSSValueMapping.cpp

@@ -492,7 +492,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFamily(const AtomicStri

{

if (CSSValueID familyIdentifier = identifierForFamily(family))

return cssValuePool().createIdentifierValue(familyIdentifier);

- return cssValuePool().createValue(family.string(), CSSPrimitiveValue::CSS_STRING);

+ return cssValuePool().createValue(family.string(), CSSPrimitiveValue::CSS_CUSTOM_IDENT);

}

static PassRefPtrWillBeRawPtr<CSSValueList> valueForFontFamily(const LayoutStyle& style)

@@ -563,7 +563,7 @@ static void addValuesForNamedGridLinesAtIndex(const OrderedNamedGridLines& order

RefPtrWillBeRawPtr<CSSGridLineNamesValue> lineNames = CSSGridLineNamesValue::create();

for (size_t j = 0; j < namedGridLines.size(); ++j)

- lineNames->append(cssValuePool().createValue(namedGridLines[j], CSSPrimitiveValue::CSS_STRING));

+ lineNames->append(cssValuePool().createValue(namedGridLines[j], CSSPrimitiveValue::CSS_CUSTOM_IDENT));

list.append(lineNames.release());

}

@@ -615,7 +615,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForGridPosition(const GridPosition&

return cssValuePool().createIdentifierValue(CSSValueAuto);

if (position.isNamedGridArea())

- return cssValuePool().createValue(position.namedGridLine(), CSSPrimitiveValue::CSS_STRING);

+ return cssValuePool().createValue(position.namedGridLine(), CSSPrimitiveValue::CSS_CUSTOM_IDENT);

RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();

if (position.isSpan()) {

@@ -626,7 +626,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForGridPosition(const GridPosition&

}

if (!position.namedGridLine().isNull())

- list->append(cssValuePool().createValue(position.namedGridLine(), CSSPrimitiveValue::CSS_STRING));

+ list->append(cssValuePool().createValue(position.namedGridLine(), CSSPrimitiveValue::CSS_CUSTOM_IDENT));

return list;

}

@@ -946,9 +946,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSST

if (property.propertyType == CSSTransitionData::TransitionAll)

return cssValuePool().createIdentifierValue(CSSValueAll);

if (property.propertyType == CSSTransitionData::TransitionUnknown)

- return cssValuePool().createValue(property.propertyString, CSSPrimitiveValue::CSS_STRING);

+ return cssValuePool().createValue(property.propertyString, CSSPrimitiveValue::CSS_CUSTOM_IDENT);

ASSERT(property.propertyType == CSSTransitionData::TransitionSingleProperty);

- return cssValuePool().createValue(getPropertyNameString(property.propertyId), CSSPrimitiveValue::CSS_STRING);

+ return cssValuePool().createValue(getPropertyNameString(property.propertyId), CSSPrimitiveValue::CSS_CUSTOM_IDENT);

}

static PassRefPtrWillBeRawPtr<CSSValue> valueForTransitionProperty(const CSSTransitionData* transitionData)

@@ -1001,7 +1001,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForCounterDirectives(const LayoutSt

if (!isValidCounterValue)

continue;

- list->append(cssValuePool().createValue(item.key, CSSPrimitiveValue::CSS_STRING));

+ list->append(cssValuePool().createValue(item.key, CSSPrimitiveValue::CSS_CUSTOM_IDENT));

short number = propertyID == CSSPropertyCounterIncrement ? item.value.incrementValue() : item.value.resetValue();

list->append(cssValuePool().createValue((double)number, CSSPrimitiveValue::CSS_NUMBER));

}

@@ -1220,7 +1220,7 @@ PassRefPtrWillBeRawPtr<CSSValue> LayoutStyleCSSValueMapping::valueForFilter(cons

switch (filterOperation->type()) {

case FilterOperation::REFERENCE:

filterValue = CSSFunctionValue::create(CSSValueUrl);

Timothy Loh 2015/03/04 23:21:45 Maybe we should just make this use a CSS_URI here.

- filterValue->append(cssValuePool().createValue(toReferenceFilterOperation(filterOperation)->url(), CSSPrimitiveValue::CSS_STRING));

+ filterValue->append(cssValuePool().createValue(toReferenceFilterOperation(filterOperation)->url(), CSSPrimitiveValue::CSS_CUSTOM_IDENT));

break;

case FilterOperation::GRAYSCALE:

filterValue = CSSFunctionValue::create(CSSValueGrayscale);

@@ -1659,11 +1659,11 @@ PassRefPtrWillBeRawPtr<CSSValue> LayoutStyleCSSValueMapping::get(CSSPropertyID p

case CSSPropertyWebkitHighlight:

if (style.highlight() == nullAtom)

return cssValuePool().createIdentifierValue(CSSValueNone);

- return cssValuePool().createValue(style.highlight(), CSSPrimitiveValue::CSS_STRING);

+ return cssValuePool().createValue(style.highlight(), CSSPrimitiveValue::CSS_CUSTOM_IDENT);

Timothy Loh 2015/03/04 23:21:45 string

case CSSPropertyWebkitHyphenateCharacter:

if (style.hyphenationString().isNull())

return cssValuePool().createIdentifierValue(CSSValueAuto);

- return cssValuePool().createValue(style.hyphenationString(), CSSPrimitiveValue::CSS_STRING);

+ return cssValuePool().createValue(style.hyphenationString(), CSSPrimitiveValue::CSS_CUSTOM_IDENT);

Timothy Loh 2015/03/04 23:21:45 string

case CSSPropertyImageRendering:

return CSSPrimitiveValue::create(style.imageRendering());

case CSSPropertyIsolation:

@@ -1695,7 +1695,7 @@ PassRefPtrWillBeRawPtr<CSSValue> LayoutStyleCSSValueMapping::get(CSSPropertyID p

case CSSPropertyWebkitLocale:

if (style.locale().isNull())

return cssValuePool().createIdentifierValue(CSSValueAuto);

- return cssValuePool().createValue(style.locale(), CSSPrimitiveValue::CSS_STRING);

+ return cssValuePool().createValue(style.locale(), CSSPrimitiveValue::CSS_CUSTOM_IDENT);

Timothy Loh 2015/03/04 23:21:45 string

case CSSPropertyMarginTop: {

Length marginTop = style.marginTop();

if (marginTop.isFixed() || !renderer || !renderer->isBox())

@@ -1863,7 +1863,7 @@ PassRefPtrWillBeRawPtr<CSSValue> LayoutStyleCSSValueMapping::get(CSSPropertyID p

case TextEmphasisMarkNone:

return cssValuePool().createIdentifierValue(CSSValueNone);

case TextEmphasisMarkCustom:

- return cssValuePool().createValue(style.textEmphasisCustomMark(), CSSPrimitiveValue::CSS_STRING);

+ return cssValuePool().createValue(style.textEmphasisCustomMark(), CSSPrimitiveValue::CSS_CUSTOM_IDENT);

Timothy Loh 2015/03/04 23:21:45 string I think?

case TextEmphasisMarkAuto:

ASSERT_NOT_REACHED();

// Fall through

@@ -2059,7 +2059,7 @@ PassRefPtrWillBeRawPtr<CSSValue> LayoutStyleCSSValueMapping::get(CSSPropertyID p

const CSSAnimationData* animationData = style.animations();

if (animationData) {

for (size_t i = 0; i < animationData->nameList().size(); ++i)

- list->append(cssValuePool().createValue(animationData->nameList()[i], CSSPrimitiveValue::CSS_STRING));

+ list->append(cssValuePool().createValue(animationData->nameList()[i], CSSPrimitiveValue::CSS_CUSTOM_IDENT));

} else {

list->append(cssValuePool().createIdentifierValue(CSSValueNone));

}

@@ -2089,7 +2089,7 @@ PassRefPtrWillBeRawPtr<CSSValue> LayoutStyleCSSValueMapping::get(CSSPropertyID p

RefPtrWillBeRawPtr<CSSValueList> animationsList = CSSValueList::createCommaSeparated();

for (size_t i = 0; i < animationData->nameList().size(); ++i) {

RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();

- list->append(cssValuePool().createValue(animationData->nameList()[i], CSSPrimitiveValue::CSS_STRING));

+ list->append(cssValuePool().createValue(animationData->nameList()[i], CSSPrimitiveValue::CSS_CUSTOM_IDENT));

list->append(cssValuePool().createValue(CSSTimingData::getRepeated(animationData->durationList(), i), CSSPrimitiveValue::CSS_S));

list->append(createTimingFunctionValue(CSSTimingData::getRepeated(animationData->timingFunctionList(), i).get()));

list->append(cssValuePool().createValue(CSSTimingData::getRepeated(animationData->delayList(), i), CSSPrimitiveValue::CSS_S));

« no previous file with comments | « Source/core/css/CSSValuePool.cpp ('k') | Source/core/css/StylePropertySerializer.cpp » ('j') | no next file with comments »