| Index: Source/core/css/resolver/StyleBuilderConverter.cpp
|
| diff --git a/Source/core/css/resolver/StyleBuilderConverter.cpp b/Source/core/css/resolver/StyleBuilderConverter.cpp
|
| index 6449b765b3dd55410b1ec7aa281c116cf76cac66..55f49b37af692dd7a820590200bb0147e004429c 100644
|
| --- a/Source/core/css/resolver/StyleBuilderConverter.cpp
|
| +++ b/Source/core/css/resolver/StyleBuilderConverter.cpp
|
| @@ -28,6 +28,7 @@
|
| #include "core/css/resolver/StyleBuilderConverter.h"
|
|
|
| #include "core/css/BasicShapeFunctions.h"
|
| +#include "core/css/CSSContentDistributionValue.h"
|
| #include "core/css/CSSFontFeatureValue.h"
|
| #include "core/css/CSSFunctionValue.h"
|
| #include "core/css/CSSGridLineNamesValue.h"
|
| @@ -331,6 +332,37 @@ EGlyphOrientation StyleBuilderConverter::convertGlyphOrientation(StyleResolverSt
|
| return GO_270DEG;
|
| }
|
|
|
| +StyleSelfAlignmentData StyleBuilderConverter::convertSelfOrDefaultAlignmentData(StyleResolverState&, CSSValue* value)
|
| +{
|
| + StyleSelfAlignmentData alignmentData = ComputedStyle::initialSelfAlignment();
|
| + CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
|
| + if (Pair* pairValue = primitiveValue->getPairValue()) {
|
| + if (pairValue->first()->getValueID() == CSSValueLegacy) {
|
| + alignmentData.setPositionType(LegacyPosition);
|
| + alignmentData.setPosition(*pairValue->second());
|
| + } else {
|
| + alignmentData.setPosition(*pairValue->first());
|
| + alignmentData.setOverflow(*pairValue->second());
|
| + }
|
| + } else {
|
| + alignmentData.setPosition(*primitiveValue);
|
| + }
|
| + return alignmentData;
|
| +}
|
| +
|
| +StyleContentAlignmentData StyleBuilderConverter::convertContentAlignmentData(StyleResolverState&, CSSValue* value)
|
| +{
|
| + StyleContentAlignmentData alignmentData = ComputedStyle::initialContentAlignment();
|
| + CSSContentDistributionValue* contentValue = toCSSContentDistributionValue(value);
|
| + if (contentValue->distribution()->getValueID() != CSSValueInvalid)
|
| + alignmentData.setDistribution(*contentValue->distribution());
|
| + if (contentValue->position()->getValueID() != CSSValueInvalid)
|
| + alignmentData.setPosition(*contentValue->position());
|
| + if (contentValue->overflow()->getValueID() != CSSValueInvalid)
|
| + alignmentData.setOverflow(*contentValue->overflow());
|
| + return alignmentData;
|
| +}
|
| +
|
| GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(StyleResolverState&, CSSValue* value)
|
| {
|
| CSSValueList* list = toCSSValueList(value);
|
|
|