| Index: Source/core/css/resolver/StyleBuilderConverter.cpp
|
| diff --git a/Source/core/css/resolver/StyleBuilderConverter.cpp b/Source/core/css/resolver/StyleBuilderConverter.cpp
|
| index 2d6ea3d6d726b6166baa7cccc20e0a36c14cacc1..6e5bd05a6dd1013e935d01db62d1aaa109513191 100644
|
| --- a/Source/core/css/resolver/StyleBuilderConverter.cpp
|
| +++ b/Source/core/css/resolver/StyleBuilderConverter.cpp
|
| @@ -317,9 +317,6 @@ FontDescription::VariantLigatures StyleBuilderConverter::convertFontVariantLigat
|
|
|
| EGlyphOrientation StyleBuilderConverter::convertGlyphOrientation(StyleResolverState&, CSSValue* value)
|
| {
|
| - if (!value->isPrimitiveValue())
|
| - return GO_0DEG;
|
| -
|
| CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
|
| if (primitiveValue->typeWithCalcResolved() != CSSPrimitiveValue::UnitType::Degrees)
|
| return GO_0DEG;
|
| @@ -461,17 +458,13 @@ GridTrackSize StyleBuilderConverter::convertGridTrackSize(StyleResolverState& st
|
| return GridTrackSize(minTrackBreadth, maxTrackBreadth);
|
| }
|
|
|
| -bool StyleBuilderConverter::convertGridTrackList(CSSValue* value, Vector<GridTrackSize>& trackSizes, NamedGridLinesMap& namedGridLines, OrderedNamedGridLines& orderedNamedGridLines, StyleResolverState& state)
|
| +void StyleBuilderConverter::convertGridTrackList(CSSValue* value, Vector<GridTrackSize>& trackSizes, NamedGridLinesMap& namedGridLines, OrderedNamedGridLines& orderedNamedGridLines, StyleResolverState& state)
|
| {
|
| - // Handle 'none'.
|
| if (value->isPrimitiveValue()) {
|
| - CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
|
| - return primitiveValue->getValueID() == CSSValueNone;
|
| + ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
|
| + return;
|
| }
|
|
|
| - if (!value->isValueList())
|
| - return false;
|
| -
|
| size_t currentNamedGridLine = 0;
|
| for (auto& currValue : *toCSSValueList(value)) {
|
| if (currValue->isGridLineNamesValue()) {
|
| @@ -492,7 +485,6 @@ bool StyleBuilderConverter::convertGridTrackList(CSSValue* value, Vector<GridTra
|
| // The parser should have rejected any <track-list> without any <track-size> as
|
| // this is not conformant to the syntax.
|
| ASSERT(!trackSizes.isEmpty());
|
| - return true;
|
| }
|
|
|
| void StyleBuilderConverter::convertOrderedNamedGridLinesMapToNamedGridLinesMap(const OrderedNamedGridLines& orderedNamedGridLines, NamedGridLinesMap& namedGridLines)
|
| @@ -852,10 +844,6 @@ PassRefPtr<SVGDashArray> StyleBuilderConverter::convertStrokeDasharray(StyleReso
|
| RefPtr<SVGDashArray> array = SVGDashArray::create();
|
| size_t length = dashes->length();
|
| for (size_t i = 0; i < length; ++i) {
|
| - CSSValue* currValue = dashes->item(i);
|
| - if (!currValue->isPrimitiveValue())
|
| - continue;
|
| -
|
| CSSPrimitiveValue* dash = toCSSPrimitiveValue(dashes->item(i));
|
| array->append(convertLength(state, dash));
|
| }
|
| @@ -984,5 +972,4 @@ RespectImageOrientationEnum StyleBuilderConverter::convertImageOrientation(Style
|
| return primitiveValue->getValueID() == CSSValueFromImage ? RespectImageOrientation : DoNotRespectImageOrientation;
|
| }
|
|
|
| -
|
| } // namespace blink
|
|
|