Source/core/css/ComputedStyleCSSValueMapping.cpp - Issue 1306823004: Split out String, URI and CustomIdent from CSSPrimitiveValue

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

Issue 1306823004: Split out String, URI and CustomIdent from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_attr_values

Patch Set: Fixing tests Created 5 years, 3 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/ComputedStyleCSSValueMapping.cpp

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

index 15e7959687276d50ab1a43e60c5bad9373b87a1a..98a69a99ee24c1d110cd1644969733e7d0ba0c37 100644

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

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

@@ -39,6 +39,7 @@

#include "core/css/CSSQuadValue.h"

#include "core/css/CSSReflectValue.h"

#include "core/css/CSSShadowValue.h"

+#include "core/css/CSSStringValueBase.h"

#include "core/css/CSSTimingFunctionValue.h"

#include "core/css/CSSValueList.h"

#include "core/css/CSSValuePair.h"

@@ -490,11 +491,11 @@ static CSSValueID identifierForFamily(const AtomicString& family)

return CSSValueInvalid;

}

-static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFamily(const AtomicString& family)

+static PassRefPtrWillBeRawPtr<CSSValue> valueForFamily(const AtomicString& family)

{

if (CSSValueID familyIdentifier = identifierForFamily(family))

return cssValuePool().createIdentifierValue(familyIdentifier);

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

+ return CSSCustomIdentValue::create(family.string());

}

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

@@ -565,7 +566,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::UnitType::CustomIdentifier));

+ lineNames->append(CSSCustomIdentValue::create(namedGridLines[j]));

list.append(lineNames.release());

}

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

return cssValuePool().createIdentifierValue(CSSValueAuto);

if (position.isNamedGridArea())

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

+ return CSSCustomIdentValue::create(position.namedGridLine());

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

if (position.isSpan()) {

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

}

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

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

+ list->append(CSSCustomIdentValue::create(position.namedGridLine()));

return list;

}

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

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

return cssValuePool().createIdentifierValue(CSSValueNone);

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

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

+ return CSSCustomIdentValue::create(property.propertyString);

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

- return cssValuePool().createValue(getPropertyNameString(property.unresolvedProperty), CSSPrimitiveValue::UnitType::CustomIdentifier);

+ return CSSCustomIdentValue::create(getPropertyNameString(property.unresolvedProperty));

}

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

@@ -981,8 +982,8 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForContentData(const ComputedStyle&

if (contentData->isCounter()) {

const CounterContent* counter = toCounterContentData(contentData)->counter();

ASSERT(counter);

- RefPtrWillBeRawPtr<CSSPrimitiveValue> identifier = cssValuePool().createValue(counter->identifier(), CSSPrimitiveValue::UnitType::CustomIdentifier);

- RefPtrWillBeRawPtr<CSSPrimitiveValue> separator = cssValuePool().createValue(counter->separator(), CSSPrimitiveValue::UnitType::CustomIdentifier);

+ RefPtrWillBeRawPtr<CSSCustomIdentValue> identifier = CSSCustomIdentValue::create(counter->identifier());

+ RefPtrWillBeRawPtr<CSSCustomIdentValue> separator = CSSCustomIdentValue::create(counter->separator());

CSSValueID listStyleIdent = CSSValueNone;

if (counter->listStyle() != NoneListStyle)

listStyleIdent = static_cast<CSSValueID>(CSSValueDisc + counter->listStyle());

@@ -993,7 +994,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForContentData(const ComputedStyle&

ASSERT(image);

list->append(image->cssValue());

} else if (contentData->isText()) {

- list->append(cssValuePool().createValue(toTextContentData(contentData)->text(), CSSPrimitiveValue::UnitType::String));

+ list->append(CSSStringValue::create(toTextContentData(contentData)->text()));

} else if (contentData->isQuote()) {

const QuoteType quoteType = toQuoteContentData(contentData)->quote();

list->append(cssValuePool().createIdentifierValue(valueForQuoteType(quoteType)));

@@ -1016,7 +1017,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForCounterDirectives(const Computed

if (!isValidCounterValue)

continue;

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

+ list->append(CSSCustomIdentValue::create(item.key));

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

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

}

@@ -1172,7 +1173,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> adjustSVGPaintForCurrentColor(SVGPaintTy

{

if (paintType >= SVG_PAINTTYPE_URI_NONE) {

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

- values->append(CSSPrimitiveValue::create(url, CSSPrimitiveValue::UnitType::URI));

+ values->append(CSSURIValue::create(url));

if (paintType == SVG_PAINTTYPE_URI_NONE)

values->append(CSSPrimitiveValue::create(CSSValueNone));

else if (paintType == SVG_PAINTTYPE_URI_CURRENTCOLOR)

@@ -1231,7 +1232,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::valueForFilter(co

switch (filterOperation->type()) {

case FilterOperation::REFERENCE:

filterValue = CSSFunctionValue::create(CSSValueUrl);

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

+ filterValue->append(CSSCustomIdentValue::create(toReferenceFilterOperation(filterOperation)->url()));

break;

case FilterOperation::GRAYSCALE:

filterValue = CSSFunctionValue::create(CSSValueGrayscale);

@@ -1707,11 +1708,11 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

case CSSPropertyWebkitHighlight:

if (style.highlight() == nullAtom)

return cssValuePool().createIdentifierValue(CSSValueNone);

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

+ return CSSStringValue::create(style.highlight());

case CSSPropertyWebkitHyphenateCharacter:

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

return cssValuePool().createIdentifierValue(CSSValueAuto);

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

+ return CSSStringValue::create(style.hyphenationString());

case CSSPropertyImageRendering:

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

case CSSPropertyImageOrientation:

@@ -1747,7 +1748,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

case CSSPropertyWebkitLocale:

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

return cssValuePool().createIdentifierValue(CSSValueAuto);

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

+ return CSSStringValue::create(style.locale());

case CSSPropertyMarginTop: {

Length marginTop = style.marginTop();

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

@@ -1885,8 +1886,8 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

if (style.quotes()->size()) {

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

for (int i = 0; i < style.quotes()->size(); i++) {

- list->append(cssValuePool().createValue(style.quotes()->getOpenQuote(i), CSSPrimitiveValue::UnitType::String));

- list->append(cssValuePool().createValue(style.quotes()->getCloseQuote(i), CSSPrimitiveValue::UnitType::String));

+ list->append(CSSStringValue::create(style.quotes()->getOpenQuote(i)));

+ list->append(CSSStringValue::create(style.quotes()->getCloseQuote(i)));

}

return list.release();

}

@@ -1930,7 +1931,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

case TextEmphasisMarkNone:

return cssValuePool().createIdentifierValue(CSSValueNone);

case TextEmphasisMarkCustom:

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

+ return CSSStringValue::create(style.textEmphasisCustomMark());

case TextEmphasisMarkAuto:

ASSERT_NOT_REACHED();

// Fall through

@@ -2108,7 +2109,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

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::UnitType::CustomIdentifier));

+ list->append(CSSCustomIdentValue::create(animationData->nameList()[i]));

} else {

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

}

@@ -2133,7 +2134,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

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::UnitType::CustomIdentifier));

+ list->append(CSSCustomIdentValue::create(animationData->nameList()[i]));

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

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

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

@@ -2315,7 +2316,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

if (operation->type() == ClipPathOperation::SHAPE)

return valueForBasicShape(style, toShapeClipPathOperation(operation)->basicShape());

if (operation->type() == ClipPathOperation::REFERENCE)

- return CSSPrimitiveValue::create(toReferenceClipPathOperation(operation)->url(), CSSPrimitiveValue::UnitType::URI);

+ return CSSURIValue::create(toReferenceClipPathOperation(operation)->url());

}

return cssValuePool().createIdentifierValue(CSSValueNone);

case CSSPropertyShapeMargin:

@@ -2519,15 +2520,15 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

return CSSPrimitiveValue::create(svgStyle.writingMode());

case CSSPropertyClipPath:

if (!svgStyle.clipperResource().isEmpty())

- return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.clipperResource()), CSSPrimitiveValue::UnitType::URI);

+ return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.clipperResource()));

return CSSPrimitiveValue::createIdentifier(CSSValueNone);

case CSSPropertyMask:

if (!svgStyle.maskerResource().isEmpty())

- return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.maskerResource()), CSSPrimitiveValue::UnitType::URI);

+ return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.maskerResource()));

return CSSPrimitiveValue::createIdentifier(CSSValueNone);

case CSSPropertyFilter:

if (!svgStyle.filterResource().isEmpty())

- return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.filterResource()), CSSPrimitiveValue::UnitType::URI);

+ return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.filterResource()));

return CSSPrimitiveValue::createIdentifier(CSSValueNone);

case CSSPropertyFloodColor:

return currentColorOrValidColor(style, svgStyle.floodColor());

@@ -2539,15 +2540,15 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID

return adjustSVGPaintForCurrentColor(svgStyle.fillPaintType(), svgStyle.fillPaintUri(), svgStyle.fillPaintColor(), style.color());

case CSSPropertyMarkerEnd:

if (!svgStyle.markerEndResource().isEmpty())

- return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.markerEndResource()), CSSPrimitiveValue::UnitType::URI);

+ return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.markerEndResource()));

return CSSPrimitiveValue::createIdentifier(CSSValueNone);

case CSSPropertyMarkerMid:

if (!svgStyle.markerMidResource().isEmpty())

- return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.markerMidResource()), CSSPrimitiveValue::UnitType::URI);

+ return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.markerMidResource()));

return CSSPrimitiveValue::createIdentifier(CSSValueNone);

case CSSPropertyMarkerStart:

if (!svgStyle.markerStartResource().isEmpty())

- return CSSPrimitiveValue::create(serializeAsFragmentIdentifier(svgStyle.markerStartResource()), CSSPrimitiveValue::UnitType::URI);

+ return CSSURIValue::create(serializeAsFragmentIdentifier(svgStyle.markerStartResource()));

return CSSPrimitiveValue::createIdentifier(CSSValueNone);

case CSSPropertyStroke:

return adjustSVGPaintForCurrentColor(svgStyle.strokePaintType(), svgStyle.strokePaintUri(), svgStyle.strokePaintColor(), style.color());

« Source/core/css/CSSStringValueBase.h ('K') | « Source/core/css/CSSValuePool.cpp ('k') | Source/core/css/FontFace.cpp » ('j') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('J')