| Index: Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| diff --git a/Source/core/css/ComputedStyleCSSValueMapping.cpp b/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| index 5e0abcd57615130bae75205ee60c84910cce19e4..b559e2c799063c764fcba222e3e8537aade534aa 100644
|
| --- a/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| +++ b/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| @@ -62,24 +62,24 @@ inline static bool isFlexOrGrid(Node* element)
|
| && element->ensureComputedStyle()->isDisplayFlexibleOrGridBox();
|
| }
|
|
|
| -inline static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const ComputedStyle& style)
|
| +inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const ComputedStyle& style)
|
| {
|
| return cssValuePool().createValue(adjustFloatForAbsoluteZoom(value, style), CSSPrimitiveValue::UnitType::Pixels);
|
| }
|
|
|
| -inline static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> zoomAdjustedNumberValue(double value, const ComputedStyle& style)
|
| +inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedNumberValue(double value, const ComputedStyle& style)
|
| {
|
| return cssValuePool().createValue(value / style.effectiveZoom(), CSSPrimitiveValue::UnitType::Number);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> zoomAdjustedPixelValueForLength(const Length& length, const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValueForLength(const Length& length, const ComputedStyle& style)
|
| {
|
| if (length.isFixed())
|
| return zoomAdjustedPixelValue(length.value(), style);
|
| return cssValuePool().createValue(length, style);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> pixelValueForUnzoomedLength(const UnzoomedLength& unzoomedLength, const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> pixelValueForUnzoomedLength(const UnzoomedLength& unzoomedLength, const ComputedStyle& style)
|
| {
|
| const Length& length = unzoomedLength.length();
|
| if (length.isFixed())
|
| @@ -87,9 +87,9 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> pixelValueForUnzoomedLength(con
|
| return cssValuePool().createValue(length, style);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> createPositionListForLayer(CSSPropertyID propertyID, const FillLayer& layer, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValueList> createPositionListForLayer(CSSPropertyID propertyID, const FillLayer& layer, const ComputedStyle& style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> positionList = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> positionList = CSSValueList::createSpaceSeparated();
|
| if (layer.isBackgroundXOriginSet()) {
|
| ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPosition || propertyID == CSSPropertyWebkitMaskPosition);
|
| positionList->append(cssValuePool().createValue(layer.backgroundXOrigin()));
|
| @@ -103,13 +103,13 @@ static PassRefPtrWillBeRawPtr<CSSValueList> createPositionListForLayer(CSSProper
|
| return positionList.release();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> ComputedStyleCSSValueMapping::currentColorOrValidColor(const ComputedStyle& style, const StyleColor& color)
|
| +PassRefPtr<CSSPrimitiveValue> ComputedStyleCSSValueMapping::currentColorOrValidColor(const ComputedStyle& style, const StyleColor& color)
|
| {
|
| // This function does NOT look at visited information, so that computed style doesn't expose that.
|
| return cssValuePool().createColorValue(color.resolve(style.color()).rgb());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForFillSize(const FillSize& fillSize, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForFillSize(const FillSize& fillSize, const ComputedStyle& style)
|
| {
|
| if (fillSize.type == Contain)
|
| return cssValuePool().createIdentifierValue(CSSValueContain);
|
| @@ -120,13 +120,13 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForFillSize(const FillSize& fillSiz
|
| if (fillSize.size.height().isAuto())
|
| return zoomAdjustedPixelValueForLength(fillSize.size.width(), style);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(zoomAdjustedPixelValueForLength(fillSize.size.width(), style));
|
| list->append(zoomAdjustedPixelValueForLength(fillSize.size.height(), style));
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForFillRepeat(EFillRepeat xRepeat, EFillRepeat yRepeat)
|
| +static PassRefPtr<CSSValue> valueForFillRepeat(EFillRepeat xRepeat, EFillRepeat yRepeat)
|
| {
|
| // For backwards compatibility, if both values are equal, just return one of them. And
|
| // if the two values are equivalent to repeat-x or repeat-y, just return the shorthand.
|
| @@ -137,13 +137,13 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForFillRepeat(EFillRepeat xRepeat,
|
| if (xRepeat == NoRepeatFill && yRepeat == RepeatFill)
|
| return cssValuePool().createIdentifierValue(CSSValueRepeatY);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(cssValuePool().createValue(xRepeat));
|
| list->append(cssValuePool().createValue(yRepeat));
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForFillSourceType(EMaskSourceType type)
|
| +static PassRefPtr<CSSValue> valueForFillSourceType(EMaskSourceType type)
|
| {
|
| switch (type) {
|
| case MaskAlpha:
|
| @@ -157,7 +157,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForFillSourceType(EMaskSourceType t
|
| return nullptr;
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForPositionOffset(const ComputedStyle& style, CSSPropertyID propertyID, const LayoutObject* layoutObject)
|
| +static PassRefPtr<CSSValue> valueForPositionOffset(const ComputedStyle& style, CSSPropertyID propertyID, const LayoutObject* layoutObject)
|
| {
|
| Length offset;
|
| switch (propertyID) {
|
| @@ -193,13 +193,13 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForPositionOffset(const ComputedSty
|
| return zoomAdjustedPixelValueForLength(offset, style);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSBorderImageSliceValue> valueForNinePieceImageSlice(const NinePieceImage& image)
|
| +static PassRefPtr<CSSBorderImageSliceValue> valueForNinePieceImageSlice(const NinePieceImage& image)
|
| {
|
| // Create the slices.
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> top = nullptr;
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> right = nullptr;
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom = nullptr;
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> left = nullptr;
|
| + RefPtr<CSSPrimitiveValue> top = nullptr;
|
| + RefPtr<CSSPrimitiveValue> right = nullptr;
|
| + RefPtr<CSSPrimitiveValue> bottom = nullptr;
|
| + RefPtr<CSSPrimitiveValue> left = nullptr;
|
|
|
| // TODO(alancutter): Make this code aware of calc lengths.
|
| if (image.imageSlices().top().hasPercent())
|
| @@ -238,7 +238,7 @@ static PassRefPtrWillBeRawPtr<CSSBorderImageSliceValue> valueForNinePieceImageSl
|
| }
|
| }
|
|
|
| - RefPtrWillBeRawPtr<Quad> quad = Quad::create();
|
| + RefPtr<Quad> quad = Quad::create();
|
| quad->setTop(top);
|
| quad->setRight(right);
|
| quad->setBottom(bottom);
|
| @@ -247,13 +247,13 @@ static PassRefPtrWillBeRawPtr<CSSBorderImageSliceValue> valueForNinePieceImageSl
|
| return CSSBorderImageSliceValue::create(cssValuePool().createValue(quad.release()), image.fill());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(const BorderImageLengthBox& box, const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(const BorderImageLengthBox& box, const ComputedStyle& style)
|
| {
|
| // Create the slices.
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> top = nullptr;
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> right = nullptr;
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> bottom = nullptr;
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> left = nullptr;
|
| + RefPtr<CSSPrimitiveValue> top = nullptr;
|
| + RefPtr<CSSPrimitiveValue> right = nullptr;
|
| + RefPtr<CSSPrimitiveValue> bottom = nullptr;
|
| + RefPtr<CSSPrimitiveValue> left = nullptr;
|
|
|
| if (box.top().isNumber())
|
| top = cssValuePool().createValue(box.top().number(), CSSPrimitiveValue::UnitType::Number);
|
| @@ -290,7 +290,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(cons
|
| }
|
| }
|
|
|
| - RefPtrWillBeRawPtr<Quad> quad = Quad::create();
|
| + RefPtr<Quad> quad = Quad::create();
|
| quad->setTop(top);
|
| quad->setRight(right);
|
| quad->setBottom(bottom);
|
| @@ -313,10 +313,10 @@ static CSSValueID valueForRepeatRule(int rule)
|
| }
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForNinePieceImageRepeat(const NinePieceImage& image)
|
| +static PassRefPtr<CSSValue> valueForNinePieceImageRepeat(const NinePieceImage& image)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> horizontalRepeat = nullptr;
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> verticalRepeat = nullptr;
|
| + RefPtr<CSSPrimitiveValue> horizontalRepeat = nullptr;
|
| + RefPtr<CSSPrimitiveValue> verticalRepeat = nullptr;
|
|
|
| horizontalRepeat = cssValuePool().createIdentifierValue(valueForRepeatRule(image.horizontalRule()));
|
| if (image.horizontalRule() == image.verticalRule())
|
| @@ -326,44 +326,44 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForNinePieceImageRepeat(const NineP
|
| return cssValuePool().createValue(Pair::create(horizontalRepeat.release(), verticalRepeat.release(), Pair::DropIdenticalValues));
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForNinePieceImage(const NinePieceImage& image, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForNinePieceImage(const NinePieceImage& image, const ComputedStyle& style)
|
| {
|
| if (!image.hasImage())
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
|
|
| // Image first.
|
| - RefPtrWillBeRawPtr<CSSValue> imageValue = nullptr;
|
| + RefPtr<CSSValue> imageValue = nullptr;
|
| if (image.image())
|
| imageValue = image.image()->cssValue();
|
|
|
| // Create the image slice.
|
| - RefPtrWillBeRawPtr<CSSBorderImageSliceValue> imageSlices = valueForNinePieceImageSlice(image);
|
| + RefPtr<CSSBorderImageSliceValue> imageSlices = valueForNinePieceImageSlice(image);
|
|
|
| // Create the border area slices.
|
| - RefPtrWillBeRawPtr<CSSValue> borderSlices = valueForNinePieceImageQuad(image.borderSlices(), style);
|
| + RefPtr<CSSValue> borderSlices = valueForNinePieceImageQuad(image.borderSlices(), style);
|
|
|
| // Create the border outset.
|
| - RefPtrWillBeRawPtr<CSSValue> outset = valueForNinePieceImageQuad(image.outset(), style);
|
| + RefPtr<CSSValue> outset = valueForNinePieceImageQuad(image.outset(), style);
|
|
|
| // Create the repeat rules.
|
| - RefPtrWillBeRawPtr<CSSValue> repeat = valueForNinePieceImageRepeat(image);
|
| + RefPtr<CSSValue> repeat = valueForNinePieceImageRepeat(image);
|
|
|
| return createBorderImageValue(imageValue.release(), imageSlices.release(), borderSlices.release(), outset.release(), repeat.release());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForReflection(const StyleReflection* reflection, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForReflection(const StyleReflection* reflection, const ComputedStyle& style)
|
| {
|
| if (!reflection)
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
|
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> offset = nullptr;
|
| + RefPtr<CSSPrimitiveValue> offset = nullptr;
|
| // TODO(alancutter): Make this work correctly for calc lengths.
|
| if (reflection->offset().hasPercent())
|
| offset = cssValuePool().createValue(reflection->offset().percent(), CSSPrimitiveValue::UnitType::Percentage);
|
| else
|
| offset = zoomAdjustedPixelValue(reflection->offset().value(), style);
|
|
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> direction = nullptr;
|
| + RefPtr<CSSPrimitiveValue> direction = nullptr;
|
| switch (reflection->direction()) {
|
| case ReflectionBelow:
|
| direction = cssValuePool().createIdentifierValue(CSSValueBelow);
|
| @@ -390,9 +390,9 @@ static ItemPosition resolveAlignmentAuto(ItemPosition position, Node* element)
|
| return isFlexOrGrid(element) ? ItemPositionStretch : ItemPositionStart;
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valueForItemPositionWithOverflowAlignment(ItemPosition itemPosition, OverflowAlignment overflowAlignment, ItemPositionType positionType)
|
| +static PassRefPtr<CSSValueList> valueForItemPositionWithOverflowAlignment(ItemPosition itemPosition, OverflowAlignment overflowAlignment, ItemPositionType positionType)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
|
| if (positionType == LegacyPosition)
|
| result->append(CSSPrimitiveValue::createIdentifier(CSSValueLegacy));
|
| result->append(CSSPrimitiveValue::create(itemPosition));
|
| @@ -402,37 +402,37 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valueForItemPositionWithOverflowAlig
|
| return result.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valuesForGridShorthand(const StylePropertyShorthand& shorthand, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| +static PassRefPtr<CSSValueList> valuesForGridShorthand(const StylePropertyShorthand& shorthand, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
|
| for (size_t i = 0; i < shorthand.length(); ++i) {
|
| - RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(shorthand.properties()[i], style, layoutObject, styledNode, allowVisitedStyle);
|
| + RefPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(shorthand.properties()[i], style, layoutObject, styledNode, allowVisitedStyle);
|
| ASSERT(value);
|
| list->append(value.release());
|
| }
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valuesForShorthandProperty(const StylePropertyShorthand& shorthand, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| +static PassRefPtr<CSSValueList> valuesForShorthandProperty(const StylePropertyShorthand& shorthand, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| for (size_t i = 0; i < shorthand.length(); ++i) {
|
| - RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(shorthand.properties()[i], style, layoutObject, styledNode, allowVisitedStyle);
|
| + RefPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(shorthand.properties()[i], style, layoutObject, styledNode, allowVisitedStyle);
|
| ASSERT(value);
|
| list->append(value);
|
| }
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valuesForBackgroundShorthand(const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| +static PassRefPtr<CSSValueList> valuesForBackgroundShorthand(const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> ret = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> ret = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next()) {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
|
| - RefPtrWillBeRawPtr<CSSValueList> beforeSlash = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
|
| + RefPtr<CSSValueList> beforeSlash = CSSValueList::createSpaceSeparated();
|
| if (!currLayer->next()) { // color only for final layer
|
| - RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(CSSPropertyBackgroundColor, style, layoutObject, styledNode, allowVisitedStyle);
|
| + RefPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(CSSPropertyBackgroundColor, style, layoutObject, styledNode, allowVisitedStyle);
|
| ASSERT(value);
|
| beforeSlash->append(value);
|
| }
|
| @@ -441,7 +441,7 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valuesForBackgroundShorthand(const C
|
| beforeSlash->append(cssValuePool().createValue(currLayer->attachment()));
|
| beforeSlash->append(createPositionListForLayer(CSSPropertyBackgroundPosition, *currLayer, style));
|
| list->append(beforeSlash);
|
| - RefPtrWillBeRawPtr<CSSValueList> afterSlash = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> afterSlash = CSSValueList::createSpaceSeparated();
|
| afterSlash->append(valueForFillSize(currLayer->size(), style));
|
| afterSlash->append(cssValuePool().createValue(currLayer->origin()));
|
| afterSlash->append(cssValuePool().createValue(currLayer->clip()));
|
| @@ -462,9 +462,9 @@ static ContentPosition resolveContentAlignmentAuto(ContentPosition position, Con
|
| return isFlex ? ContentPositionFlexStart : ContentPositionStart;
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valueForContentPositionAndDistributionWithOverflowAlignment(ContentPosition position, OverflowAlignment overflowAlignment, ContentDistributionType distribution)
|
| +static PassRefPtr<CSSValueList> valueForContentPositionAndDistributionWithOverflowAlignment(ContentPosition position, OverflowAlignment overflowAlignment, ContentDistributionType distribution)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
|
| if (distribution != ContentDistributionDefault)
|
| result->append(CSSPrimitiveValue::create(distribution));
|
| if (distribution == ContentDistributionDefault || position != ContentPositionAuto)
|
| @@ -476,7 +476,7 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valueForContentPositionAndDistributi
|
| return result.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForLineHeight(const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> valueForLineHeight(const ComputedStyle& style)
|
| {
|
| Length length = style.lineHeight();
|
| if (length.isNegative())
|
| @@ -502,48 +502,48 @@ static CSSValueID identifierForFamily(const AtomicString& family)
|
| return CSSValueInvalid;
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFamily(const AtomicString& family)
|
| +static PassRefPtr<CSSPrimitiveValue> valueForFamily(const AtomicString& family)
|
| {
|
| if (CSSValueID familyIdentifier = identifierForFamily(family))
|
| return cssValuePool().createIdentifierValue(familyIdentifier);
|
| return cssValuePool().createValue(family.string(), CSSPrimitiveValue::UnitType::CustomIdentifier);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valueForFontFamily(const ComputedStyle& style)
|
| +static PassRefPtr<CSSValueList> valueForFontFamily(const ComputedStyle& style)
|
| {
|
| const FontFamily& firstFamily = style.fontDescription().family();
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| for (const FontFamily* family = &firstFamily; family; family = family->next())
|
| list->append(valueForFamily(family->family()));
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFontSize(const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> valueForFontSize(const ComputedStyle& style)
|
| {
|
| return zoomAdjustedPixelValue(style.fontDescription().computedSize(), style);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFontStretch(const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> valueForFontStretch(const ComputedStyle& style)
|
| {
|
| return cssValuePool().createValue(style.fontDescription().stretch());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFontStyle(const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> valueForFontStyle(const ComputedStyle& style)
|
| {
|
| return cssValuePool().createValue(style.fontDescription().style());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFontVariant(const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> valueForFontVariant(const ComputedStyle& style)
|
| {
|
| return cssValuePool().createValue(style.fontDescription().variant());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> valueForFontWeight(const ComputedStyle& style)
|
| +static PassRefPtr<CSSPrimitiveValue> valueForFontWeight(const ComputedStyle& style)
|
| {
|
| return cssValuePool().createValue(style.fontDescription().weight());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> specifiedValueForGridTrackBreadth(const GridLength& trackBreadth, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> specifiedValueForGridTrackBreadth(const GridLength& trackBreadth, const ComputedStyle& style)
|
| {
|
| if (!trackBreadth.isLength())
|
| return cssValuePool().createValue(trackBreadth.flex(), CSSPrimitiveValue::UnitType::Fraction);
|
| @@ -554,13 +554,13 @@ static PassRefPtrWillBeRawPtr<CSSValue> specifiedValueForGridTrackBreadth(const
|
| return zoomAdjustedPixelValueForLength(trackBreadthLength, style);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> specifiedValueForGridTrackSize(const GridTrackSize& trackSize, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> specifiedValueForGridTrackSize(const GridTrackSize& trackSize, const ComputedStyle& style)
|
| {
|
| switch (trackSize.type()) {
|
| case LengthTrackSizing:
|
| return specifiedValueForGridTrackBreadth(trackSize.length(), style);
|
| case MinMaxTrackSizing:
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> minMaxTrackBreadths = CSSFunctionValue::create(CSSValueMinmax);
|
| + RefPtr<CSSFunctionValue> minMaxTrackBreadths = CSSFunctionValue::create(CSSValueMinmax);
|
| minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.minTrackBreadth(), style));
|
| minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.maxTrackBreadth(), style));
|
| return minMaxTrackBreadths.release();
|
| @@ -575,13 +575,13 @@ static void addValuesForNamedGridLinesAtIndex(const OrderedNamedGridLines& order
|
| if (namedGridLines.isEmpty())
|
| return;
|
|
|
| - RefPtrWillBeRawPtr<CSSGridLineNamesValue> lineNames = CSSGridLineNamesValue::create();
|
| + RefPtr<CSSGridLineNamesValue> lineNames = CSSGridLineNamesValue::create();
|
| for (size_t j = 0; j < namedGridLines.size(); ++j)
|
| lineNames->append(cssValuePool().createValue(namedGridLines[j], CSSPrimitiveValue::UnitType::CustomIdentifier));
|
| list.append(lineNames.release());
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForGridTrackList(GridTrackSizingDirection direction, const LayoutObject* layoutObject, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForGridTrackList(GridTrackSizingDirection direction, const LayoutObject* layoutObject, const ComputedStyle& style)
|
| {
|
| const Vector<GridTrackSize>& trackSizes = direction == ForColumns ? style.gridTemplateColumns() : style.gridTemplateRows();
|
| const OrderedNamedGridLines& orderedNamedGridLines = direction == ForColumns ? style.orderedNamedGridColumnLines() : style.orderedNamedGridRowLines();
|
| @@ -601,7 +601,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForGridTrackList(GridTrackSizingDir
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
| }
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| size_t insertionIndex;
|
| if (isLayoutGrid) {
|
| const Vector<LayoutUnit>& trackPositions = direction == ForColumns ? toLayoutGrid(layoutObject)->columnPositions() : toLayoutGrid(layoutObject)->rowPositions();
|
| @@ -626,7 +626,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForGridTrackList(GridTrackSizingDir
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForGridPosition(const GridPosition& position)
|
| +static PassRefPtr<CSSValue> valueForGridPosition(const GridPosition& position)
|
| {
|
| if (position.isAuto())
|
| return cssValuePool().createIdentifierValue(CSSValueAuto);
|
| @@ -634,7 +634,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForGridPosition(const GridPosition&
|
| if (position.isNamedGridArea())
|
| return cssValuePool().createValue(position.namedGridLine(), CSSPrimitiveValue::UnitType::CustomIdentifier);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (position.isSpan()) {
|
| list->append(cssValuePool().createIdentifierValue(CSSValueSpan));
|
| list->append(cssValuePool().createValue(position.spanPosition(), CSSPrimitiveValue::UnitType::Number));
|
| @@ -656,10 +656,10 @@ static LayoutRect sizingBox(const LayoutObject* layoutObject)
|
| return box->style()->boxSizing() == BORDER_BOX ? box->borderBoxRect() : box->computedCSSContentBoxRect();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> renderTextDecorationFlagsToCSSValue(int textDecoration)
|
| +static PassRefPtr<CSSValue> renderTextDecorationFlagsToCSSValue(int textDecoration)
|
| {
|
| // Blink value is ignored.
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (textDecoration & TextDecorationUnderline)
|
| list->append(cssValuePool().createIdentifierValue(CSSValueUnderline));
|
| if (textDecoration & TextDecorationOverline)
|
| @@ -672,7 +672,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> renderTextDecorationFlagsToCSSValue(int
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForTextDecorationStyle(TextDecorationStyle textDecorationStyle)
|
| +static PassRefPtr<CSSValue> valueForTextDecorationStyle(TextDecorationStyle textDecorationStyle)
|
| {
|
| switch (textDecorationStyle) {
|
| case TextDecorationStyleSolid:
|
| @@ -691,9 +691,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForTextDecorationStyle(TextDecorati
|
| return cssValuePool().createExplicitInitialValue();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction touchAction)
|
| +static PassRefPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction touchAction)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (touchAction == TouchActionAuto)
|
| list->append(cssValuePool().createIdentifierValue(CSSValueAuto));
|
| if (touchAction & TouchActionNone) {
|
| @@ -721,9 +721,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForWillChange(const Vector<CSSPropertyID>& willChangeProperties, bool willChangeContents, bool willChangeScrollPosition)
|
| +static PassRefPtr<CSSValue> valueForWillChange(const Vector<CSSPropertyID>& willChangeProperties, bool willChangeContents, bool willChangeScrollPosition)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| if (willChangeContents)
|
| list->append(cssValuePool().createIdentifierValue(CSSValueContents));
|
| if (willChangeScrollPosition)
|
| @@ -735,9 +735,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForWillChange(const Vector<CSSPrope
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationDelay(const CSSTimingData* timingData)
|
| +static PassRefPtr<CSSValue> valueForAnimationDelay(const CSSTimingData* timingData)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| if (timingData) {
|
| for (size_t i = 0; i < timingData->delayList().size(); ++i)
|
| list->append(cssValuePool().createValue(timingData->delayList()[i], CSSPrimitiveValue::UnitType::Seconds));
|
| @@ -747,7 +747,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationDelay(const CSSTimingDa
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationDirection(Timing::PlaybackDirection direction)
|
| +static PassRefPtr<CSSValue> valueForAnimationDirection(Timing::PlaybackDirection direction)
|
| {
|
| switch (direction) {
|
| case Timing::PlaybackDirectionNormal:
|
| @@ -764,9 +764,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationDirection(Timing::Playb
|
| }
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationDuration(const CSSTimingData* timingData)
|
| +static PassRefPtr<CSSValue> valueForAnimationDuration(const CSSTimingData* timingData)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| if (timingData) {
|
| for (size_t i = 0; i < timingData->durationList().size(); ++i)
|
| list->append(cssValuePool().createValue(timingData->durationList()[i], CSSPrimitiveValue::UnitType::Seconds));
|
| @@ -776,7 +776,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationDuration(const CSSTimin
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationFillMode(Timing::FillMode fillMode)
|
| +static PassRefPtr<CSSValue> valueForAnimationFillMode(Timing::FillMode fillMode)
|
| {
|
| switch (fillMode) {
|
| case Timing::FillModeNone:
|
| @@ -793,14 +793,14 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationFillMode(Timing::FillMo
|
| }
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationIterationCount(double iterationCount)
|
| +static PassRefPtr<CSSValue> valueForAnimationIterationCount(double iterationCount)
|
| {
|
| if (iterationCount == std::numeric_limits<double>::infinity())
|
| return cssValuePool().createIdentifierValue(CSSValueInfinite);
|
| return cssValuePool().createValue(iterationCount, CSSPrimitiveValue::UnitType::Number);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationPlayState(EAnimPlayState playState)
|
| +static PassRefPtr<CSSValue> valueForAnimationPlayState(EAnimPlayState playState)
|
| {
|
| if (playState == AnimPlayStatePlaying)
|
| return cssValuePool().createIdentifierValue(CSSValueRunning);
|
| @@ -808,7 +808,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationPlayState(EAnimPlayStat
|
| return cssValuePool().createIdentifierValue(CSSValuePaused);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> createTimingFunctionValue(const TimingFunction* timingFunction)
|
| +static PassRefPtr<CSSValue> createTimingFunctionValue(const TimingFunction* timingFunction)
|
| {
|
| switch (timingFunction->type()) {
|
| case TimingFunction::CubicBezierFunction:
|
| @@ -856,9 +856,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> createTimingFunctionValue(const TimingFu
|
| }
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationTimingFunction(const CSSTimingData* timingData)
|
| +static PassRefPtr<CSSValue> valueForAnimationTimingFunction(const CSSTimingData* timingData)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| if (timingData) {
|
| for (size_t i = 0; i < timingData->timingFunctionList().size(); ++i)
|
| list->append(createTimingFunctionValue(timingData->timingFunctionList()[i].get()));
|
| @@ -868,9 +868,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForAnimationTimingFunction(const CS
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valuesForBorderRadiusCorner(LengthSize radius, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValueList> valuesForBorderRadiusCorner(LengthSize radius, const ComputedStyle& style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (radius.width().type() == Percent)
|
| list->append(cssValuePool().createValue(radius.width().percent(), CSSPrimitiveValue::UnitType::Percentage));
|
| else
|
| @@ -882,17 +882,17 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valuesForBorderRadiusCorner(LengthSi
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForBorderRadiusCorner(LengthSize radius, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForBorderRadiusCorner(LengthSize radius, const ComputedStyle& style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = valuesForBorderRadiusCorner(radius, style);
|
| + RefPtr<CSSValueList> list = valuesForBorderRadiusCorner(radius, style);
|
| if (list->item(0)->equals(*list->item(1)))
|
| return list->item(0);
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSFunctionValue> valueForMatrixTransform(const TransformationMatrix& transform, const ComputedStyle& style)
|
| +static PassRefPtr<CSSFunctionValue> valueForMatrixTransform(const TransformationMatrix& transform, const ComputedStyle& style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> transformValue = nullptr;
|
| + RefPtr<CSSFunctionValue> transformValue = nullptr;
|
| if (transform.isAffine()) {
|
| transformValue = CSSFunctionValue::create(CSSValueMatrix);
|
|
|
| @@ -929,7 +929,7 @@ static PassRefPtrWillBeRawPtr<CSSFunctionValue> valueForMatrixTransform(const Tr
|
| return transformValue.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> computedTransform(const LayoutObject* layoutObject, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> computedTransform(const LayoutObject* layoutObject, const ComputedStyle& style)
|
| {
|
| if (!layoutObject || !style.hasTransform())
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
| @@ -942,13 +942,13 @@ static PassRefPtrWillBeRawPtr<CSSValue> computedTransform(const LayoutObject* la
|
| style.applyTransform(transform, LayoutSize(box.size()), ComputedStyle::ExcludeTransformOrigin, ComputedStyle::ExcludeMotionPath, ComputedStyle::ExcludeIndependentTransformProperties);
|
|
|
| // FIXME: Need to print out individual functions (https://bugs.webkit.org/show_bug.cgi?id=23924)
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(valueForMatrixTransform(transform, style));
|
|
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSSTransitionData::TransitionProperty& property)
|
| +static PassRefPtr<CSSValue> createTransitionPropertyValue(const CSSTransitionData::TransitionProperty& property)
|
| {
|
| if (property.propertyType == CSSTransitionData::TransitionNone)
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
| @@ -958,9 +958,9 @@ static PassRefPtrWillBeRawPtr<CSSValue> createTransitionPropertyValue(const CSST
|
| return cssValuePool().createValue(getPropertyNameString(property.unresolvedProperty), CSSPrimitiveValue::UnitType::CustomIdentifier);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForTransitionProperty(const CSSTransitionData* transitionData)
|
| +static PassRefPtr<CSSValue> valueForTransitionProperty(const CSSTransitionData* transitionData)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| if (transitionData) {
|
| for (size_t i = 0; i < transitionData->propertyList().size(); ++i)
|
| list->append(createTransitionPropertyValue(transitionData->propertyList()[i]));
|
| @@ -970,7 +970,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForTransitionProperty(const CSSTran
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> createLineBoxContainValue(unsigned lineBoxContain)
|
| +static PassRefPtr<CSSValue> createLineBoxContainValue(unsigned lineBoxContain)
|
| {
|
| if (!lineBoxContain)
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
| @@ -993,19 +993,19 @@ CSSValueID valueForQuoteType(const QuoteType quoteType)
|
| return CSSValueInvalid;
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForContentData(const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForContentData(const ComputedStyle& style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| for (const ContentData* contentData = style.contentData(); contentData; contentData = contentData->next()) {
|
| 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);
|
| + RefPtr<CSSPrimitiveValue> identifier = cssValuePool().createValue(counter->identifier(), CSSPrimitiveValue::UnitType::CustomIdentifier);
|
| + RefPtr<CSSPrimitiveValue> separator = cssValuePool().createValue(counter->separator(), CSSPrimitiveValue::UnitType::CustomIdentifier);
|
| CSSValueID listStyleIdent = CSSValueNone;
|
| if (counter->listStyle() != NoneListStyle)
|
| listStyleIdent = static_cast<CSSValueID>(CSSValueDisc + counter->listStyle());
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> listStyle = cssValuePool().createIdentifierValue(listStyleIdent);
|
| + RefPtr<CSSPrimitiveValue> listStyle = cssValuePool().createIdentifierValue(listStyleIdent);
|
| list->append(CSSCounterValue::create(identifier.release(), listStyle.release(), separator.release()));
|
| } else if (contentData->isImage()) {
|
| const StyleImage* image = toImageContentData(contentData)->image();
|
| @@ -1023,13 +1023,13 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForContentData(const ComputedStyle&
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForCounterDirectives(const ComputedStyle& style, CSSPropertyID propertyID)
|
| +static PassRefPtr<CSSValue> valueForCounterDirectives(const ComputedStyle& style, CSSPropertyID propertyID)
|
| {
|
| const CounterDirectiveMap* map = style.counterDirectives();
|
| if (!map)
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| for (const auto& item : *map) {
|
| bool isValidCounterValue = propertyID == CSSPropertyCounterIncrement ? item.value.isIncrement() : item.value.isReset();
|
| if (!isValidCounterValue)
|
| @@ -1046,7 +1046,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForCounterDirectives(const Computed
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const ComputedStyle& style, ShapeValue* shapeValue)
|
| +static PassRefPtr<CSSValue> valueForShape(const ComputedStyle& style, ShapeValue* shapeValue)
|
| {
|
| if (!shapeValue)
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
| @@ -1060,21 +1060,21 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const ComputedStyle& style
|
|
|
| ASSERT(shapeValue->type() == ShapeValue::Shape);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(valueForBasicShape(style, shapeValue->shape()));
|
| if (shapeValue->cssBox() != BoxMissing)
|
| list->append(cssValuePool().createValue(shapeValue->cssBox()));
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valuesForSidesShorthand(const StylePropertyShorthand& shorthand, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| +static PassRefPtr<CSSValueList> valuesForSidesShorthand(const StylePropertyShorthand& shorthand, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| // Assume the properties are in the usual order top, right, bottom, left.
|
| - RefPtrWillBeRawPtr<CSSValue> topValue = ComputedStyleCSSValueMapping::get(shorthand.properties()[0], style, layoutObject, styledNode, allowVisitedStyle);
|
| - RefPtrWillBeRawPtr<CSSValue> rightValue = ComputedStyleCSSValueMapping::get(shorthand.properties()[1], style, layoutObject, styledNode, allowVisitedStyle);
|
| - RefPtrWillBeRawPtr<CSSValue> bottomValue = ComputedStyleCSSValueMapping::get(shorthand.properties()[2], style, layoutObject, styledNode, allowVisitedStyle);
|
| - RefPtrWillBeRawPtr<CSSValue> leftValue = ComputedStyleCSSValueMapping::get(shorthand.properties()[3], style, layoutObject, styledNode, allowVisitedStyle);
|
| + RefPtr<CSSValue> topValue = ComputedStyleCSSValueMapping::get(shorthand.properties()[0], style, layoutObject, styledNode, allowVisitedStyle);
|
| + RefPtr<CSSValue> rightValue = ComputedStyleCSSValueMapping::get(shorthand.properties()[1], style, layoutObject, styledNode, allowVisitedStyle);
|
| + RefPtr<CSSValue> bottomValue = ComputedStyleCSSValueMapping::get(shorthand.properties()[2], style, layoutObject, styledNode, allowVisitedStyle);
|
| + RefPtr<CSSValue> leftValue = ComputedStyleCSSValueMapping::get(shorthand.properties()[3], style, layoutObject, styledNode, allowVisitedStyle);
|
|
|
| // All 4 properties must be specified.
|
| if (!topValue || !rightValue || !bottomValue || !leftValue)
|
| @@ -1095,9 +1095,9 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valuesForSidesShorthand(const StyleP
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValueList> valueForBorderRadiusShorthand(const ComputedStyle& style)
|
| +static PassRefPtr<CSSValueList> valueForBorderRadiusShorthand(const ComputedStyle& style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
|
|
|
| bool showHorizontalBottomLeft = style.borderTopRightRadius().width() != style.borderBottomLeftRadius().width();
|
| bool showHorizontalBottomRight = showHorizontalBottomLeft || (style.borderBottomRightRadius().width() != style.borderTopLeftRadius().width());
|
| @@ -1107,12 +1107,12 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valueForBorderRadiusShorthand(const
|
| bool showVerticalBottomRight = showVerticalBottomLeft || (style.borderBottomRightRadius().height() != style.borderTopLeftRadius().height());
|
| bool showVerticalTopRight = showVerticalBottomRight || (style.borderTopRightRadius().height() != style.borderTopLeftRadius().height());
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> topLeftRadius = valuesForBorderRadiusCorner(style.borderTopLeftRadius(), style);
|
| - RefPtrWillBeRawPtr<CSSValueList> topRightRadius = valuesForBorderRadiusCorner(style.borderTopRightRadius(), style);
|
| - RefPtrWillBeRawPtr<CSSValueList> bottomRightRadius = valuesForBorderRadiusCorner(style.borderBottomRightRadius(), style);
|
| - RefPtrWillBeRawPtr<CSSValueList> bottomLeftRadius = valuesForBorderRadiusCorner(style.borderBottomLeftRadius(), style);
|
| + RefPtr<CSSValueList> topLeftRadius = valuesForBorderRadiusCorner(style.borderTopLeftRadius(), style);
|
| + RefPtr<CSSValueList> topRightRadius = valuesForBorderRadiusCorner(style.borderTopRightRadius(), style);
|
| + RefPtr<CSSValueList> bottomRightRadius = valuesForBorderRadiusCorner(style.borderBottomRightRadius(), style);
|
| + RefPtr<CSSValueList> bottomLeftRadius = valuesForBorderRadiusCorner(style.borderBottomLeftRadius(), style);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> horizontalRadii = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> horizontalRadii = CSSValueList::createSpaceSeparated();
|
| horizontalRadii->append(topLeftRadius->item(0));
|
| if (showHorizontalTopRight)
|
| horizontalRadii->append(topRightRadius->item(0));
|
| @@ -1123,7 +1123,7 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valueForBorderRadiusShorthand(const
|
|
|
| list->append(horizontalRadii.release());
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> verticalRadii = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> verticalRadii = CSSValueList::createSpaceSeparated();
|
| verticalRadii->append(topLeftRadius->item(1));
|
| if (showVerticalTopRight)
|
| verticalRadii->append(topRightRadius->item(1));
|
| @@ -1138,7 +1138,7 @@ static PassRefPtrWillBeRawPtr<CSSValueList> valueForBorderRadiusShorthand(const
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> glyphOrientationToCSSPrimitiveValue(EGlyphOrientation orientation)
|
| +static PassRefPtr<CSSPrimitiveValue> glyphOrientationToCSSPrimitiveValue(EGlyphOrientation orientation)
|
| {
|
| switch (orientation) {
|
| case GO_0DEG:
|
| @@ -1154,21 +1154,21 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> glyphOrientationToCSSPrimitiveV
|
| }
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> strokeDashArrayToCSSValueList(const SVGDashArray& dashes, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> strokeDashArrayToCSSValueList(const SVGDashArray& dashes, const ComputedStyle& style)
|
| {
|
| if (dashes.isEmpty())
|
| return CSSPrimitiveValue::createIdentifier(CSSValueNone);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| for (const Length& dashLength : dashes.vector())
|
| list->append(zoomAdjustedPixelValueForLength(dashLength, style));
|
|
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> paintOrderToCSSValueList(const SVGComputedStyle& svgStyle)
|
| +static PassRefPtr<CSSValue> paintOrderToCSSValueList(const SVGComputedStyle& svgStyle)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| for (int i = 0; i < 3; i++) {
|
| EPaintOrderType paintOrderType = svgStyle.paintOrderType(i);
|
| switch (paintOrderType) {
|
| @@ -1187,10 +1187,10 @@ static PassRefPtrWillBeRawPtr<CSSValue> paintOrderToCSSValueList(const SVGComput
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> adjustSVGPaintForCurrentColor(SVGPaintType paintType, const String& url, const Color& color, const Color& currentColor)
|
| +static PassRefPtr<CSSValue> adjustSVGPaintForCurrentColor(SVGPaintType paintType, const String& url, const Color& color, const Color& currentColor)
|
| {
|
| if (paintType >= SVG_PAINTTYPE_URI_NONE) {
|
| - RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
|
| values->append(CSSPrimitiveValue::create(url, CSSPrimitiveValue::UnitType::URI));
|
| if (paintType == SVG_PAINTTYPE_URI_NONE)
|
| values->append(CSSPrimitiveValue::create(CSSValueNone));
|
| @@ -1213,37 +1213,37 @@ static inline String serializeAsFragmentIdentifier(const AtomicString& resource)
|
| return "#" + resource;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::valueForShadowData(const ShadowData& shadow, const ComputedStyle& style, bool useSpread)
|
| +PassRefPtr<CSSValue> ComputedStyleCSSValueMapping::valueForShadowData(const ShadowData& shadow, const ComputedStyle& style, bool useSpread)
|
| {
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(shadow.x(), style);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(shadow.y(), style);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(shadow.blur(), style);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = useSpread ? zoomAdjustedPixelValue(shadow.spread(), style) : PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullptr);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> shadowStyle = shadow.style() == Normal ? PassRefPtrWillBeRawPtr<CSSPrimitiveValue>(nullptr) : cssValuePool().createIdentifierValue(CSSValueInset);
|
| - RefPtrWillBeRawPtr<CSSPrimitiveValue> color = currentColorOrValidColor(style, shadow.color());
|
| + RefPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(shadow.x(), style);
|
| + RefPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(shadow.y(), style);
|
| + RefPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(shadow.blur(), style);
|
| + RefPtr<CSSPrimitiveValue> spread = useSpread ? zoomAdjustedPixelValue(shadow.spread(), style) : PassRefPtr<CSSPrimitiveValue>(nullptr);
|
| + RefPtr<CSSPrimitiveValue> shadowStyle = shadow.style() == Normal ? PassRefPtr<CSSPrimitiveValue>(nullptr) : cssValuePool().createIdentifierValue(CSSValueInset);
|
| + RefPtr<CSSPrimitiveValue> color = currentColorOrValidColor(style, shadow.color());
|
| return CSSShadowValue::create(x.release(), y.release(), blur.release(), spread.release(), shadowStyle.release(), color.release());
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::valueForShadowList(const ShadowList* shadowList, const ComputedStyle& style, bool useSpread)
|
| +PassRefPtr<CSSValue> ComputedStyleCSSValueMapping::valueForShadowList(const ShadowList* shadowList, const ComputedStyle& style, bool useSpread)
|
| {
|
| if (!shadowList)
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| size_t shadowCount = shadowList->shadows().size();
|
| for (size_t i = 0; i < shadowCount; ++i)
|
| list->append(valueForShadowData(shadowList->shadows()[i], style, useSpread));
|
| return list.release();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::valueForFilter(const ComputedStyle& style)
|
| +PassRefPtr<CSSValue> ComputedStyleCSSValueMapping::valueForFilter(const ComputedStyle& style)
|
| {
|
| if (style.filter().operations().isEmpty())
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
|
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> filterValue = nullptr;
|
| + RefPtr<CSSFunctionValue> filterValue = nullptr;
|
|
|
| for (const auto& operation : style.filter().operations()) {
|
| FilterOperation* filterOperation = operation.get();
|
| @@ -1306,14 +1306,14 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::valueForFilter(co
|
| return list.release();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::valueForFont(const ComputedStyle& style)
|
| +PassRefPtr<CSSValue> ComputedStyleCSSValueMapping::valueForFont(const ComputedStyle& style)
|
| {
|
| // Add a slash between size and line-height.
|
| - RefPtrWillBeRawPtr<CSSValueList> sizeAndLineHeight = CSSValueList::createSlashSeparated();
|
| + RefPtr<CSSValueList> sizeAndLineHeight = CSSValueList::createSlashSeparated();
|
| sizeAndLineHeight->append(valueForFontSize(style));
|
| sizeAndLineHeight->append(valueForLineHeight(style));
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(valueForFontStyle(style));
|
| list->append(valueForFontVariant(style));
|
| list->append(valueForFontWeight(style));
|
| @@ -1324,18 +1324,18 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::valueForFont(cons
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForScrollSnapDestination(const LengthPoint& destination, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForScrollSnapDestination(const LengthPoint& destination, const ComputedStyle& style)
|
| {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(zoomAdjustedPixelValueForLength(destination.x(), style));
|
| list->append(zoomAdjustedPixelValueForLength(destination.y(), style));
|
| return list.release();
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForScrollSnapPoints(const ScrollSnapPoints& points, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForScrollSnapPoints(const ScrollSnapPoints& points, const ComputedStyle& style)
|
| {
|
| if (points.hasRepeat) {
|
| - RefPtrWillBeRawPtr<CSSFunctionValue> repeat = CSSFunctionValue::create(CSSValueRepeat);
|
| + RefPtr<CSSFunctionValue> repeat = CSSFunctionValue::create(CSSValueRepeat);
|
| repeat->append(zoomAdjustedPixelValueForLength(points.repeatOffset, style));
|
| return repeat.release();
|
| }
|
| @@ -1343,12 +1343,12 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForScrollSnapPoints(const ScrollSna
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
| }
|
|
|
| -static PassRefPtrWillBeRawPtr<CSSValue> valueForScrollSnapCoordinate(const Vector<LengthPoint>& coordinates, const ComputedStyle& style)
|
| +static PassRefPtr<CSSValue> valueForScrollSnapCoordinate(const Vector<LengthPoint>& coordinates, const ComputedStyle& style)
|
| {
|
| if (coordinates.isEmpty())
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
|
|
| for (auto& coordinate : coordinates) {
|
| auto pair = CSSValueList::createSpaceSeparated();
|
| @@ -1360,7 +1360,7 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForScrollSnapCoordinate(const Vecto
|
| return list.release();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID propertyID, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| +PassRefPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID propertyID, const ComputedStyle& style, const LayoutObject* layoutObject, Node* styledNode, bool allowVisitedStyle)
|
| {
|
| const SVGComputedStyle& svgStyle = style.svgStyle();
|
| propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style.direction(), style.writingMode());
|
| @@ -1372,7 +1372,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return allowVisitedStyle ? cssValuePool().createColorValue(style.visitedDependentColor(CSSPropertyBackgroundColor).rgb()) : currentColorOrValidColor(style, style.backgroundColor());
|
| case CSSPropertyBackgroundImage:
|
| case CSSPropertyWebkitMaskImage: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskImage ? &style.maskLayers() : &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next()) {
|
| if (currLayer->image())
|
| @@ -1384,7 +1384,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| }
|
| case CSSPropertyBackgroundSize:
|
| case CSSPropertyWebkitMaskSize: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskSize ? &style.maskLayers() : &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next())
|
| list->append(valueForFillSize(currLayer->size(), style));
|
| @@ -1392,28 +1392,28 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| }
|
| case CSSPropertyBackgroundRepeat:
|
| case CSSPropertyWebkitMaskRepeat: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskRepeat ? &style.maskLayers() : &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next())
|
| list->append(valueForFillRepeat(currLayer->repeatX(), currLayer->repeatY()));
|
| return list.release();
|
| }
|
| case CSSPropertyMaskSourceType: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| for (const FillLayer* currLayer = &style.maskLayers(); currLayer; currLayer = currLayer->next())
|
| list->append(valueForFillSourceType(currLayer->maskSourceType()));
|
| return list.release();
|
| }
|
| case CSSPropertyWebkitBackgroundComposite:
|
| case CSSPropertyWebkitMaskComposite: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskComposite ? &style.maskLayers() : &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next())
|
| list->append(cssValuePool().createValue(currLayer->composite()));
|
| return list.release();
|
| }
|
| case CSSPropertyBackgroundAttachment: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| for (const FillLayer* currLayer = &style.backgroundLayers(); currLayer; currLayer = currLayer->next())
|
| list->append(cssValuePool().createValue(currLayer->attachment()));
|
| return list.release();
|
| @@ -1425,7 +1425,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyWebkitMaskClip:
|
| case CSSPropertyWebkitMaskOrigin: {
|
| bool isClip = propertyID == CSSPropertyBackgroundClip || propertyID == CSSPropertyWebkitBackgroundClip || propertyID == CSSPropertyWebkitMaskClip;
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = (propertyID == CSSPropertyWebkitMaskClip || propertyID == CSSPropertyWebkitMaskOrigin) ? &style.maskLayers() : &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next()) {
|
| EFillBox box = isClip ? currLayer->clip() : currLayer->origin();
|
| @@ -1435,7 +1435,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| }
|
| case CSSPropertyBackgroundPosition:
|
| case CSSPropertyWebkitMaskPosition: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskPosition ? &style.maskLayers() : &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next())
|
| list->append(createPositionListForLayer(propertyID, *currLayer, style));
|
| @@ -1443,7 +1443,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| }
|
| case CSSPropertyBackgroundPositionX:
|
| case CSSPropertyWebkitMaskPositionX: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskPositionX ? &style.maskLayers() : &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next())
|
| list->append(zoomAdjustedPixelValueForLength(currLayer->xPosition(), style));
|
| @@ -1451,7 +1451,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| }
|
| case CSSPropertyBackgroundPositionY:
|
| case CSSPropertyWebkitMaskPositionY: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const FillLayer* currLayer = propertyID == CSSPropertyWebkitMaskPositionY ? &style.maskLayers() : &style.backgroundLayers();
|
| for (; currLayer; currLayer = currLayer->next())
|
| list->append(zoomAdjustedPixelValueForLength(currLayer->yPosition(), style));
|
| @@ -1462,7 +1462,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return cssValuePool().createIdentifierValue(CSSValueCollapse);
|
| return cssValuePool().createIdentifierValue(CSSValueSeparate);
|
| case CSSPropertyBorderSpacing: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(zoomAdjustedPixelValue(style.horizontalBorderSpacing(), style));
|
| list->append(zoomAdjustedPixelValue(style.verticalBorderSpacing(), style));
|
| return list.release();
|
| @@ -1566,7 +1566,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return cssValuePool().createValue(
|
| style.tabSize().getPixelSize(1.0), style.tabSize().isSpaces() ? CSSPrimitiveValue::UnitType::Number : CSSPrimitiveValue::UnitType::Pixels);
|
| case CSSPropertyCursor: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = nullptr;
|
| + RefPtr<CSSValueList> list = nullptr;
|
| CursorList* cursors = style.cursors();
|
| if (cursors && cursors->size() > 0) {
|
| list = CSSValueList::createCommaSeparated();
|
| @@ -1575,7 +1575,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| list->append(image->cssValue());
|
| }
|
| }
|
| - RefPtrWillBeRawPtr<CSSValue> value = cssValuePool().createValue(style.cursor());
|
| + RefPtr<CSSValue> value = cssValuePool().createValue(style.cursor());
|
| if (list) {
|
| list->append(value.release());
|
| return list.release();
|
| @@ -1638,16 +1638,16 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| const FontFeatureSettings* featureSettings = style.fontDescription().featureSettings();
|
| if (!featureSettings || !featureSettings->size())
|
| return cssValuePool().createIdentifierValue(CSSValueNormal);
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| for (unsigned i = 0; i < featureSettings->size(); ++i) {
|
| const FontFeature& feature = featureSettings->at(i);
|
| - RefPtrWillBeRawPtr<CSSFontFeatureValue> featureValue = CSSFontFeatureValue::create(feature.tag(), feature.value());
|
| + RefPtr<CSSFontFeatureValue> featureValue = CSSFontFeatureValue::create(feature.tag(), feature.value());
|
| list->append(featureValue.release());
|
| }
|
| return list.release();
|
| }
|
| case CSSPropertyGridAutoFlow: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| switch (style.gridAutoFlow()) {
|
| case AutoFlowRow:
|
| case AutoFlowRowDense:
|
| @@ -1903,7 +1903,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return nullptr;
|
| }
|
| if (style.quotes()->size()) {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<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));
|
| @@ -1959,14 +1959,14 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case TextEmphasisMarkDoubleCircle:
|
| case TextEmphasisMarkTriangle:
|
| case TextEmphasisMarkSesame: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(cssValuePool().createValue(style.textEmphasisFill()));
|
| list->append(cssValuePool().createValue(style.textEmphasisMark()));
|
| return list.release();
|
| }
|
| }
|
| case CSSPropertyTextIndent: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(zoomAdjustedPixelValueForLength(style.textIndent(), style));
|
| if (RuntimeEnabledFeatures::css3TextEnabled() && (style.textIndentLine() == TextIndentEachLine || style.textIndentType() == TextIndentHanging)) {
|
| if (style.textIndentLine() == TextIndentEachLine)
|
| @@ -2063,7 +2063,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| && historicalLigaturesState == FontDescription::NormalLigaturesState && contextualLigaturesState == FontDescription::NormalLigaturesState)
|
| return cssValuePool().createIdentifierValue(CSSValueNormal);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> valueList = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> valueList = CSSValueList::createSpaceSeparated();
|
| if (commonLigaturesState != FontDescription::NormalLigaturesState)
|
| valueList->append(cssValuePool().createIdentifierValue(commonLigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoCommonLigatures : CSSValueCommonLigatures));
|
| if (discretionaryLigaturesState != FontDescription::NormalLigaturesState)
|
| @@ -2089,7 +2089,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyAnimationDelay:
|
| return valueForAnimationDelay(style.animations());
|
| case CSSPropertyAnimationDirection: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const CSSAnimationData* animationData = style.animations();
|
| if (animationData) {
|
| for (size_t i = 0; i < animationData->directionList().size(); ++i)
|
| @@ -2102,7 +2102,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyAnimationDuration:
|
| return valueForAnimationDuration(style.animations());
|
| case CSSPropertyAnimationFillMode: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const CSSAnimationData* animationData = style.animations();
|
| if (animationData) {
|
| for (size_t i = 0; i < animationData->fillModeList().size(); ++i)
|
| @@ -2113,7 +2113,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return list.release();
|
| }
|
| case CSSPropertyAnimationIterationCount: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const CSSAnimationData* animationData = style.animations();
|
| if (animationData) {
|
| for (size_t i = 0; i < animationData->iterationCountList().size(); ++i)
|
| @@ -2124,7 +2124,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return list.release();
|
| }
|
| case CSSPropertyAnimationName: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const CSSAnimationData* animationData = style.animations();
|
| if (animationData) {
|
| for (size_t i = 0; i < animationData->nameList().size(); ++i)
|
| @@ -2135,7 +2135,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return list.release();
|
| }
|
| case CSSPropertyAnimationPlayState: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| const CSSAnimationData* animationData = style.animations();
|
| if (animationData) {
|
| for (size_t i = 0; i < animationData->playStateList().size(); ++i)
|
| @@ -2150,9 +2150,9 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyAnimation: {
|
| const CSSAnimationData* animationData = style.animations();
|
| if (animationData) {
|
| - RefPtrWillBeRawPtr<CSSValueList> animationsList = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> animationsList = CSSValueList::createCommaSeparated();
|
| for (size_t i = 0; i < animationData->nameList().size(); ++i) {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(cssValuePool().createValue(animationData->nameList()[i], CSSPrimitiveValue::UnitType::CustomIdentifier));
|
| list->append(cssValuePool().createValue(CSSTimingData::getRepeated(animationData->durationList(), i), CSSPrimitiveValue::UnitType::Seconds));
|
| list->append(createTimingFunctionValue(CSSTimingData::getRepeated(animationData->timingFunctionList(), i).get()));
|
| @@ -2166,7 +2166,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return animationsList.release();
|
| }
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| // animation-name default value.
|
| list->append(cssValuePool().createIdentifierValue(CSSValueNone));
|
| list->append(cssValuePool().createValue(CSSAnimationData::initialDuration(), CSSPrimitiveValue::UnitType::Seconds));
|
| @@ -2221,7 +2221,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return cssValuePool().createIdentifierValue(CSSValueNone);
|
| return zoomAdjustedPixelValue(style.perspective(), style);
|
| case CSSPropertyPerspectiveOrigin: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (layoutObject) {
|
| LayoutRect box;
|
| if (layoutObject->isBox())
|
| @@ -2254,7 +2254,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyClip: {
|
| if (style.hasAutoClip())
|
| return cssValuePool().createIdentifierValue(CSSValueAuto);
|
| - RefPtrWillBeRawPtr<Rect> rect = Rect::create();
|
| + RefPtr<Rect> rect = Rect::create();
|
| rect->setTop(zoomAdjustedPixelValue(style.clip().top().value(), style));
|
| rect->setRight(zoomAdjustedPixelValue(style.clip().right().value(), style));
|
| rect->setBottom(zoomAdjustedPixelValue(style.clip().bottom().value(), style));
|
| @@ -2266,7 +2266,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyTransform:
|
| return computedTransform(layoutObject, style);
|
| case CSSPropertyTransformOrigin: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (layoutObject) {
|
| LayoutRect box;
|
| if (layoutObject->isBox())
|
| @@ -2297,9 +2297,9 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyTransition: {
|
| const CSSTransitionData* transitionData = style.transitions();
|
| if (transitionData) {
|
| - RefPtrWillBeRawPtr<CSSValueList> transitionsList = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> transitionsList = CSSValueList::createCommaSeparated();
|
| for (size_t i = 0; i < transitionData->propertyList().size(); ++i) {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(createTransitionPropertyValue(transitionData->propertyList()[i]));
|
| list->append(cssValuePool().createValue(CSSTimingData::getRepeated(transitionData->durationList(), i), CSSPrimitiveValue::UnitType::Seconds));
|
| list->append(createTimingFunctionValue(CSSTimingData::getRepeated(transitionData->timingFunctionList(), i).get()));
|
| @@ -2309,7 +2309,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return transitionsList.release();
|
| }
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| // transition-property default value.
|
| list->append(cssValuePool().createIdentifierValue(CSSValueAll));
|
| list->append(cssValuePool().createValue(CSSTransitionData::initialDuration(), CSSPrimitiveValue::UnitType::Seconds));
|
| @@ -2353,7 +2353,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| return cssValuePool().createValue(style.blendMode());
|
|
|
| case CSSPropertyBackgroundBlendMode: {
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
|
| for (const FillLayer* currLayer = &style.backgroundLayers(); currLayer; currLayer = currLayer->next())
|
| list->append(cssValuePool().createValue(currLayer->blendMode()));
|
| return list.release();
|
| @@ -2361,7 +2361,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyBackground:
|
| return valuesForBackgroundShorthand(style, layoutObject, styledNode, allowVisitedStyle);
|
| case CSSPropertyBorder: {
|
| - RefPtrWillBeRawPtr<CSSValue> value = get(CSSPropertyBorderTop, style, layoutObject, styledNode, allowVisitedStyle);
|
| + RefPtr<CSSValue> value = get(CSSPropertyBorderTop, style, layoutObject, styledNode, allowVisitedStyle);
|
| const CSSPropertyID properties[] = {
|
| CSSPropertyBorderRight,
|
| CSSPropertyBorderBottom,
|
| @@ -2428,7 +2428,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
|
|
| case CSSPropertyMotionRotation: {
|
| ASSERT(RuntimeEnabledFeatures::cssMotionPathEnabled());
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (style.motionRotationType() == MotionRotationAuto)
|
| list->append(cssValuePool().createIdentifierValue(CSSValueAuto));
|
| list->append(cssValuePool().createValue(style.motionRotation(), CSSPrimitiveValue::UnitType::Degrees));
|
| @@ -2595,7 +2595,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyGlyphOrientationHorizontal:
|
| return glyphOrientationToCSSPrimitiveValue(svgStyle.glyphOrientationHorizontal());
|
| case CSSPropertyGlyphOrientationVertical: {
|
| - if (RefPtrWillBeRawPtr<CSSPrimitiveValue> value = glyphOrientationToCSSPrimitiveValue(svgStyle.glyphOrientationVertical()))
|
| + if (RefPtr<CSSPrimitiveValue> value = glyphOrientationToCSSPrimitiveValue(svgStyle.glyphOrientationVertical()))
|
| return value.release();
|
| if (svgStyle.glyphOrientationVertical() == GO_AUTO)
|
| return CSSPrimitiveValue::createIdentifier(CSSValueAuto);
|
| @@ -2638,7 +2638,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| if (!style.translate())
|
| return cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Pixels);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| if (layoutObject && layoutObject->isBox()) {
|
| LayoutRect box = toLayoutBox(layoutObject)->borderBoxRect();
|
| list->append(zoomAdjustedPixelValue(floatValueForLength(style.translate()->x(), box.width().toFloat()), style));
|
| @@ -2663,7 +2663,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| if (!style.rotate())
|
| return cssValuePool().createValue(0, CSSPrimitiveValue::UnitType::Degrees);
|
|
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(cssValuePool().createValue(style.rotate()->angle(), CSSPrimitiveValue::UnitType::Degrees));
|
| if (style.rotate()->x() != 0 || style.rotate()->y() != 0 || style.rotate()->z() != 1) {
|
| list->append(cssValuePool().createValue(style.rotate()->x(), CSSPrimitiveValue::UnitType::Number));
|
| @@ -2675,7 +2675,7 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
|
| case CSSPropertyScale: {
|
| if (!style.scale())
|
| return cssValuePool().createValue(1, CSSPrimitiveValue::UnitType::Number);
|
| - RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
|
| list->append(cssValuePool().createValue(style.scale()->x(), CSSPrimitiveValue::UnitType::Number));
|
| if (style.scale()->y() == 1 && style.scale()->z() == 1)
|
| return list.release();
|
|
|
Chromium Code Reviews
