diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2016-08-25 19:20:41 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:30:55 +0000 |
commit | 6882a04fb36642862b11efe514251d32070c3d65 (patch) | |
tree | b7959826000b061fd5ccc7512035c7478742f7b0 /Source/WebCore/css/CSSComputedStyleDeclaration.cpp | |
parent | ab6df191029eeeb0b0f16f127d553265659f739e (diff) | |
download | qtwebkit-6882a04fb36642862b11efe514251d32070c3d65.tar.gz |
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/css/CSSComputedStyleDeclaration.cpp')
-rw-r--r-- | Source/WebCore/css/CSSComputedStyleDeclaration.cpp | 3308 |
1 files changed, 2108 insertions, 1200 deletions
diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp index f645ace2c..79da5802c 100644 --- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp +++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp @@ -1,9 +1,10 @@ /* * Copyright (C) 2004 Zack Rusin <zack@kde.org> - * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. + * Copyright (C) 2004-2014 Apple Inc. All rights reserved. * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> * Copyright (C) 2011 Sencha, Inc. All rights reserved. + * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,9 +28,13 @@ #include "AnimationController.h" #include "BasicShapeFunctions.h" #include "BasicShapes.h" +#include "CSSAnimationTriggerScrollValue.h" #include "CSSAspectRatioValue.h" #include "CSSBasicShapes.h" #include "CSSBorderImage.h" +#include "CSSCustomPropertyValue.h" +#include "CSSFontFeatureValue.h" +#include "CSSFontValue.h" #include "CSSFunctionValue.h" #include "CSSLineBoxContainValue.h" #include "CSSParser.h" @@ -38,6 +43,7 @@ #include "CSSPropertyNames.h" #include "CSSReflectValue.h" #include "CSSSelector.h" +#include "CSSShadowValue.h" #include "CSSTimingFunctionValue.h" #include "CSSValueList.h" #include "CSSValuePool.h" @@ -47,54 +53,63 @@ #include "Document.h" #include "ExceptionCode.h" #include "FontFeatureSettings.h" -#include "FontFeatureValue.h" -#include "FontValue.h" #include "HTMLFrameOwnerElement.h" #include "Pair.h" #include "PseudoElement.h" #include "Rect.h" +#include "RenderBlock.h" #include "RenderBox.h" #include "RenderStyle.h" -#include "RenderView.h" -#include "ShadowValue.h" +#include "SVGElement.h" #include "StyleInheritedData.h" -#include "StylePropertySet.h" +#include "StyleProperties.h" #include "StylePropertyShorthand.h" #include "StyleResolver.h" +#include "WebKitCSSFilterValue.h" #include "WebKitCSSTransformValue.h" #include "WebKitFontFamilyNames.h" +#include "WillChangeData.h" +#include <wtf/NeverDestroyed.h> #include <wtf/text/StringBuilder.h> +#if ENABLE(CSS_GRID_LAYOUT) +#include "CSSGridLineNamesValue.h" +#include "CSSGridTemplateAreasValue.h" +#include "RenderGrid.h" +#endif + #if ENABLE(CSS_SHAPES) #include "ShapeValue.h" #endif -#if ENABLE(CSS_SHADERS) -#include "CustomFilterArrayParameter.h" -#include "CustomFilterColorParameter.h" -#include "CustomFilterNumberParameter.h" -#include "CustomFilterOperation.h" -#include "CustomFilterParameter.h" -#include "CustomFilterTransformParameter.h" -#include "WebKitCSSArrayFunctionValue.h" -#include "WebKitCSSMatFunctionValue.h" -#include "WebKitCSSMixFunctionValue.h" +#if ENABLE(DASHBOARD_SUPPORT) +#include "DashboardRegion.h" #endif -#if ENABLE(CSS_FILTERS) -#include "StyleCustomFilterProgram.h" -#include "WebKitCSSFilterValue.h" +#if ENABLE(CSS_SCROLL_SNAP) +#include "LengthRepeat.h" +#include "StyleScrollSnapPoints.h" #endif -#if ENABLE(DASHBOARD_SUPPORT) -#include "DashboardRegion.h" +#if ENABLE(CSS_ANIMATIONS_LEVEL_2) +#include "AnimationTrigger.h" #endif namespace WebCore { // List of all properties we know how to compute, omitting shorthands. static const CSSPropertyID computedProperties[] = { + CSSPropertyAlt, + CSSPropertyAnimationDelay, + CSSPropertyAnimationDirection, + CSSPropertyAnimationDuration, + CSSPropertyAnimationFillMode, + CSSPropertyAnimationIterationCount, + CSSPropertyAnimationName, + CSSPropertyAnimationPlayState, + CSSPropertyAnimationTimingFunction, CSSPropertyBackgroundAttachment, + CSSPropertyBackgroundBlendMode, CSSPropertyBackgroundClip, CSSPropertyBackgroundColor, CSSPropertyBackgroundImage, @@ -131,6 +146,7 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyClear, CSSPropertyClip, CSSPropertyColor, + CSSPropertyContent, CSSPropertyCursor, CSSPropertyDirection, CSSPropertyDisplay, @@ -139,6 +155,7 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyFontFamily, CSSPropertyFontSize, CSSPropertyFontStyle, + CSSPropertyFontSynthesis, CSSPropertyFontVariant, CSSPropertyFontWeight, CSSPropertyHeight, @@ -189,19 +206,23 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyTextAlign, CSSPropertyTextDecoration, #if ENABLE(CSS3_TEXT) + CSSPropertyWebkitTextAlignLast, + CSSPropertyWebkitTextJustify, +#endif // CSS3_TEXT CSSPropertyWebkitTextDecorationLine, CSSPropertyWebkitTextDecorationStyle, CSSPropertyWebkitTextDecorationColor, - CSSPropertyWebkitTextAlignLast, - CSSPropertyWebkitTextJustify, + CSSPropertyWebkitTextDecorationSkip, CSSPropertyWebkitTextUnderlinePosition, -#endif // CSS3_TEXT CSSPropertyTextIndent, CSSPropertyTextRendering, CSSPropertyTextShadow, CSSPropertyTextOverflow, CSSPropertyTextTransform, CSSPropertyTop, + CSSPropertyTransform, + CSSPropertyTransformOrigin, + CSSPropertyTransformStyle, CSSPropertyTransitionDelay, CSSPropertyTransitionDuration, CSSPropertyTransitionProperty, @@ -215,9 +236,15 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyWordBreak, CSSPropertyWordSpacing, CSSPropertyWordWrap, +#if ENABLE(CSS_SCROLL_SNAP) + CSSPropertyWebkitScrollSnapType, + CSSPropertyWebkitScrollSnapPointsX, + CSSPropertyWebkitScrollSnapPointsY, + CSSPropertyWebkitScrollSnapDestination, + CSSPropertyWebkitScrollSnapCoordinate, +#endif CSSPropertyZIndex, CSSPropertyZoom, - CSSPropertyWebkitAnimationDelay, CSSPropertyWebkitAnimationDirection, CSSPropertyWebkitAnimationDuration, @@ -226,15 +253,18 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyWebkitAnimationName, CSSPropertyWebkitAnimationPlayState, CSSPropertyWebkitAnimationTimingFunction, +#if ENABLE(CSS_ANIMATIONS_LEVEL_2) + CSSPropertyWebkitAnimationTrigger, +#endif CSSPropertyWebkitAppearance, CSSPropertyWebkitBackfaceVisibility, - CSSPropertyWebkitBackgroundBlendMode, CSSPropertyWebkitBackgroundClip, CSSPropertyWebkitBackgroundComposite, CSSPropertyWebkitBackgroundOrigin, CSSPropertyWebkitBackgroundSize, #if ENABLE(CSS_COMPOSITING) - CSSPropertyWebkitBlendMode, + CSSPropertyMixBlendMode, + CSSPropertyIsolation, #endif CSSPropertyWebkitBorderFit, CSSPropertyWebkitBorderHorizontalSpacing, @@ -254,55 +284,68 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyWebkitBoxReflect, CSSPropertyWebkitBoxShadow, CSSPropertyWebkitClipPath, - CSSPropertyWebkitColorCorrection, CSSPropertyWebkitColumnBreakAfter, CSSPropertyWebkitColumnBreakBefore, CSSPropertyWebkitColumnBreakInside, CSSPropertyWebkitColumnAxis, - CSSPropertyWebkitColumnCount, - CSSPropertyWebkitColumnGap, - CSSPropertyWebkitColumnProgression, - CSSPropertyWebkitColumnRuleColor, - CSSPropertyWebkitColumnRuleStyle, - CSSPropertyWebkitColumnRuleWidth, - CSSPropertyWebkitColumnSpan, - CSSPropertyWebkitColumnWidth, + CSSPropertyColumnCount, + CSSPropertyColumnFill, + CSSPropertyColumnGap, + CSSPropertyColumnProgression, + CSSPropertyColumnRuleColor, + CSSPropertyColumnRuleStyle, + CSSPropertyColumnRuleWidth, + CSSPropertyColumnSpan, + CSSPropertyColumnWidth, #if ENABLE(CURSOR_VISIBILITY) CSSPropertyWebkitCursorVisibility, #endif #if ENABLE(DASHBOARD_SUPPORT) CSSPropertyWebkitDashboardRegion, #endif -#if ENABLE(CSS_FILTERS) - CSSPropertyWebkitFilter, + CSSPropertyAlignContent, + CSSPropertyAlignItems, + CSSPropertyAlignSelf, + CSSPropertyFilter, + CSSPropertyFlexBasis, + CSSPropertyFlexGrow, + CSSPropertyFlexShrink, + CSSPropertyFlexDirection, + CSSPropertyFlexWrap, + CSSPropertyJustifyContent, + CSSPropertyJustifySelf, + CSSPropertyJustifyItems, +#if ENABLE(FILTERS_LEVEL_2) + CSSPropertyWebkitBackdropFilter, #endif - CSSPropertyWebkitAlignContent, - CSSPropertyWebkitAlignItems, - CSSPropertyWebkitAlignSelf, - CSSPropertyWebkitFlexBasis, - CSSPropertyWebkitFlexGrow, - CSSPropertyWebkitFlexShrink, - CSSPropertyWebkitFlexDirection, - CSSPropertyWebkitFlexWrap, - CSSPropertyWebkitJustifyContent, CSSPropertyWebkitFontKerning, CSSPropertyWebkitFontSmoothing, - CSSPropertyWebkitFontVariantLigatures, + CSSPropertyFontVariantLigatures, + CSSPropertyFontVariantPosition, + CSSPropertyFontVariantCaps, + CSSPropertyFontVariantNumeric, + CSSPropertyFontVariantAlternates, + CSSPropertyFontVariantEastAsian, +#if ENABLE(CSS_GRID_LAYOUT) CSSPropertyWebkitGridAutoColumns, CSSPropertyWebkitGridAutoFlow, CSSPropertyWebkitGridAutoRows, - CSSPropertyWebkitGridDefinitionColumns, - CSSPropertyWebkitGridDefinitionRows, - CSSPropertyWebkitGridStart, - CSSPropertyWebkitGridEnd, - CSSPropertyWebkitGridBefore, - CSSPropertyWebkitGridAfter, - CSSPropertyWebkitHighlight, + CSSPropertyWebkitGridColumnEnd, + CSSPropertyWebkitGridColumnStart, + CSSPropertyWebkitGridTemplateAreas, + CSSPropertyWebkitGridTemplateColumns, + CSSPropertyWebkitGridTemplateRows, + CSSPropertyWebkitGridRowEnd, + CSSPropertyWebkitGridRowStart, + CSSPropertyWebkitGridColumnGap, + CSSPropertyWebkitGridRowGap, +#endif CSSPropertyWebkitHyphenateCharacter, CSSPropertyWebkitHyphenateLimitAfter, CSSPropertyWebkitHyphenateLimitBefore, CSSPropertyWebkitHyphenateLimitLines, CSSPropertyWebkitHyphens, + CSSPropertyWebkitInitialLetter, CSSPropertyWebkitLineAlign, CSSPropertyWebkitLineBoxContain, CSSPropertyWebkitLineBreak, @@ -329,17 +372,20 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyWebkitMaskPosition, CSSPropertyWebkitMaskRepeat, CSSPropertyWebkitMaskSize, + CSSPropertyWebkitMaskSourceType, CSSPropertyWebkitNbspMode, - CSSPropertyWebkitOrder, + CSSPropertyOrder, #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) CSSPropertyWebkitOverflowScrolling, #endif - CSSPropertyWebkitPerspective, - CSSPropertyWebkitPerspectiveOrigin, + CSSPropertyPerspective, + CSSPropertyPerspectiveOrigin, CSSPropertyWebkitPrintColorAdjust, CSSPropertyWebkitRtlOrdering, +#if PLATFORM(IOS) + CSSPropertyWebkitTouchCallout, +#endif #if ENABLE(CSS_SHAPES) - CSSPropertyWebkitShapeInside, CSSPropertyWebkitShapeOutside, #endif #if ENABLE(TOUCH_EVENTS) @@ -353,10 +399,12 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyWebkitTextFillColor, CSSPropertyWebkitTextOrientation, CSSPropertyWebkitTextSecurity, +#if ENABLE(IOS_TEXT_AUTOSIZING) + CSSPropertyWebkitTextSizeAdjust, +#endif CSSPropertyWebkitTextStrokeColor, CSSPropertyWebkitTextStrokeWidth, - CSSPropertyWebkitTransform, - CSSPropertyWebkitTransformOrigin, + CSSPropertyWebkitTextZoom, CSSPropertyWebkitTransformStyle, CSSPropertyWebkitTransitionDelay, CSSPropertyWebkitTransitionDuration, @@ -374,21 +422,15 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyWebkitRegionBreakInside, CSSPropertyWebkitRegionFragment, #endif -#if ENABLE(DRAGGABLE_REGION) - CSSPropertyWebkitAppRegion, -#endif -#if ENABLE(CSS_EXCLUSIONS) - CSSPropertyWebkitWrapFlow, - CSSPropertyWebkitWrapThrough, -#endif #if ENABLE(CSS_SHAPES) CSSPropertyWebkitShapeMargin, - CSSPropertyWebkitShapePadding, + CSSPropertyWebkitShapeImageThreshold, #endif -#if ENABLE(SVG) CSSPropertyBufferedRendering, CSSPropertyClipPath, CSSPropertyClipRule, + CSSPropertyCx, + CSSPropertyCy, CSSPropertyMask, CSSPropertyFilter, CSSPropertyFloodColor, @@ -406,6 +448,10 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyMarkerMid, CSSPropertyMarkerStart, CSSPropertyMaskType, + CSSPropertyPaintOrder, + CSSPropertyR, + CSSPropertyRx, + CSSPropertyRy, CSSPropertyShapeRendering, CSSPropertyStroke, CSSPropertyStrokeDasharray, @@ -424,8 +470,9 @@ static const CSSPropertyID computedProperties[] = { CSSPropertyGlyphOrientationHorizontal, CSSPropertyGlyphOrientationVertical, CSSPropertyWebkitSvgShadow, - CSSPropertyVectorEffect -#endif + CSSPropertyVectorEffect, + CSSPropertyX, + CSSPropertyY }; const unsigned numComputedProperties = WTF_ARRAY_LENGTH(computedProperties); @@ -444,71 +491,74 @@ static CSSValueID valueForRepeatRule(int rule) } } -static PassRefPtr<CSSBorderImageSliceValue> valueForNinePieceImageSlice(const NinePieceImage& image) +static Ref<CSSPrimitiveValue> valueForImageSliceSide(const Length& length) { - // Create the slices. - RefPtr<CSSPrimitiveValue> top; + // These values can be percentages, numbers, or while an animation of mixed types is in progress, + // a calculation that combines a percentage and a number. + if (length.isPercent()) + return CSSValuePool::singleton().createValue(length.percent(), CSSPrimitiveValue::CSS_PERCENTAGE); + if (length.isFixed()) + return CSSValuePool::singleton().createValue(length.value(), CSSPrimitiveValue::CSS_NUMBER); + + // Calculating the actual length currently in use would require most of the code from RenderBoxModelObject::paintNinePieceImage. + // And even if we could do that, it's not clear if that's exactly what we'd want during animation. + // FIXME: For now, just return 0. + ASSERT(length.isCalculated()); + return CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::CSS_NUMBER); +} + +static Ref<CSSBorderImageSliceValue> valueForNinePieceImageSlice(const NinePieceImage& image) +{ + auto& slices = image.imageSlices(); + + RefPtr<CSSPrimitiveValue> top = valueForImageSliceSide(slices.top()); + RefPtr<CSSPrimitiveValue> right; RefPtr<CSSPrimitiveValue> bottom; RefPtr<CSSPrimitiveValue> left; - if (image.imageSlices().top().isPercent()) - top = cssValuePool().createValue(image.imageSlices().top().value(), CSSPrimitiveValue::CSS_PERCENTAGE); - else - top = cssValuePool().createValue(image.imageSlices().top().value(), CSSPrimitiveValue::CSS_NUMBER); - - if (image.imageSlices().right() == image.imageSlices().top() && image.imageSlices().bottom() == image.imageSlices().top() - && image.imageSlices().left() == image.imageSlices().top()) { + if (slices.right() == slices.top() && slices.bottom() == slices.top() && slices.left() == slices.top()) { right = top; bottom = top; left = top; } else { - if (image.imageSlices().right().isPercent()) - right = cssValuePool().createValue(image.imageSlices().right().value(), CSSPrimitiveValue::CSS_PERCENTAGE); - else - right = cssValuePool().createValue(image.imageSlices().right().value(), CSSPrimitiveValue::CSS_NUMBER); + right = valueForImageSliceSide(slices.right()); - if (image.imageSlices().bottom() == image.imageSlices().top() && image.imageSlices().right() == image.imageSlices().left()) { + if (slices.bottom() == slices.top() && slices.right() == slices.left()) { bottom = top; left = right; } else { - if (image.imageSlices().bottom().isPercent()) - bottom = cssValuePool().createValue(image.imageSlices().bottom().value(), CSSPrimitiveValue::CSS_PERCENTAGE); - else - bottom = cssValuePool().createValue(image.imageSlices().bottom().value(), CSSPrimitiveValue::CSS_NUMBER); + bottom = valueForImageSliceSide(slices.bottom()); - if (image.imageSlices().left() == image.imageSlices().right()) + if (slices.left() == slices.right()) left = right; - else { - if (image.imageSlices().left().isPercent()) - left = cssValuePool().createValue(image.imageSlices().left().value(), CSSPrimitiveValue::CSS_PERCENTAGE); - else - left = cssValuePool().createValue(image.imageSlices().left().value(), CSSPrimitiveValue::CSS_NUMBER); - } + else + left = valueForImageSliceSide(slices.left()); } } - RefPtr<Quad> quad = Quad::create(); - quad->setTop(top); - quad->setRight(right); - quad->setBottom(bottom); - quad->setLeft(left); + auto quad = Quad::create(); + quad->setTop(top.release()); + quad->setRight(right.release()); + quad->setBottom(bottom.release()); + quad->setLeft(left.release()); - return CSSBorderImageSliceValue::create(cssValuePool().createValue(quad.release()), image.fill()); + return CSSBorderImageSliceValue::create(CSSValuePool::singleton().createValue(WTFMove(quad)), image.fill()); } -static PassRefPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(const LengthBox& box) +static Ref<CSSPrimitiveValue> valueForNinePieceImageQuad(const LengthBox& box) { - // Create the slices. RefPtr<CSSPrimitiveValue> top; RefPtr<CSSPrimitiveValue> right; RefPtr<CSSPrimitiveValue> bottom; RefPtr<CSSPrimitiveValue> left; + auto& cssValuePool = CSSValuePool::singleton(); + if (box.top().isRelative()) - top = cssValuePool().createValue(box.top().value(), CSSPrimitiveValue::CSS_NUMBER); + top = cssValuePool.createValue(box.top().value(), CSSPrimitiveValue::CSS_NUMBER); else - top = cssValuePool().createValue(box.top()); + top = cssValuePool.createValue(box.top()); if (box.right() == box.top() && box.bottom() == box.top() && box.left() == box.top()) { right = top; @@ -516,56 +566,56 @@ static PassRefPtr<CSSPrimitiveValue> valueForNinePieceImageQuad(const LengthBox& left = top; } else { if (box.right().isRelative()) - right = cssValuePool().createValue(box.right().value(), CSSPrimitiveValue::CSS_NUMBER); + right = cssValuePool.createValue(box.right().value(), CSSPrimitiveValue::CSS_NUMBER); else - right = cssValuePool().createValue(box.right()); + right = cssValuePool.createValue(box.right()); if (box.bottom() == box.top() && box.right() == box.left()) { bottom = top; left = right; } else { if (box.bottom().isRelative()) - bottom = cssValuePool().createValue(box.bottom().value(), CSSPrimitiveValue::CSS_NUMBER); + bottom = cssValuePool.createValue(box.bottom().value(), CSSPrimitiveValue::CSS_NUMBER); else - bottom = cssValuePool().createValue(box.bottom()); + bottom = cssValuePool.createValue(box.bottom()); if (box.left() == box.right()) left = right; else { if (box.left().isRelative()) - left = cssValuePool().createValue(box.left().value(), CSSPrimitiveValue::CSS_NUMBER); + left = cssValuePool.createValue(box.left().value(), CSSPrimitiveValue::CSS_NUMBER); else - left = cssValuePool().createValue(box.left()); + left = cssValuePool.createValue(box.left()); } } } - RefPtr<Quad> quad = Quad::create(); + auto quad = Quad::create(); quad->setTop(top); quad->setRight(right); quad->setBottom(bottom); quad->setLeft(left); - return cssValuePool().createValue(quad.release()); + return cssValuePool.createValue(WTFMove(quad)); } -static PassRefPtr<CSSValue> valueForNinePieceImageRepeat(const NinePieceImage& image) +static Ref<CSSValue> valueForNinePieceImageRepeat(const NinePieceImage& image) { - RefPtr<CSSPrimitiveValue> horizontalRepeat; - RefPtr<CSSPrimitiveValue> verticalRepeat; + auto& cssValuePool = CSSValuePool::singleton(); + RefPtr<CSSPrimitiveValue> horizontalRepeat = cssValuePool.createIdentifierValue(valueForRepeatRule(image.horizontalRule())); - horizontalRepeat = cssValuePool().createIdentifierValue(valueForRepeatRule(image.horizontalRule())); + RefPtr<CSSPrimitiveValue> verticalRepeat; if (image.horizontalRule() == image.verticalRule()) verticalRepeat = horizontalRepeat; else - verticalRepeat = cssValuePool().createIdentifierValue(valueForRepeatRule(image.verticalRule())); - return cssValuePool().createValue(Pair::create(horizontalRepeat.release(), verticalRepeat.release())); + verticalRepeat = cssValuePool.createIdentifierValue(valueForRepeatRule(image.verticalRule())); + return cssValuePool.createValue(Pair::create(horizontalRepeat.release(), verticalRepeat.release())); } -static PassRefPtr<CSSValue> valueForNinePieceImage(const NinePieceImage& image) +static Ref<CSSValue> valueForNinePieceImage(const NinePieceImage& image) { if (!image.hasImage()) - return cssValuePool().createIdentifierValue(CSSValueNone); + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); // Image first. RefPtr<CSSValue> imageValue; @@ -587,572 +637,797 @@ static PassRefPtr<CSSValue> valueForNinePieceImage(const NinePieceImage& image) return createBorderImageValue(imageValue.release(), imageSlices.release(), borderSlices.release(), outset.release(), repeat.release()); } -inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const RenderStyle* style) +inline static Ref<CSSPrimitiveValue> zoomAdjustedPixelValue(double value, const RenderStyle& style) { - return cssValuePool().createValue(adjustFloatForAbsoluteZoom(value, style), CSSPrimitiveValue::CSS_PX); + return CSSValuePool::singleton().createValue(adjustFloatForAbsoluteZoom(value, style), CSSPrimitiveValue::CSS_PX); } -inline static PassRefPtr<CSSPrimitiveValue> zoomAdjustedNumberValue(double value, const RenderStyle* style) +inline static Ref<CSSPrimitiveValue> zoomAdjustedNumberValue(double value, const RenderStyle& style) { - return cssValuePool().createValue(value / style->effectiveZoom(), CSSPrimitiveValue::CSS_NUMBER); + return CSSValuePool::singleton().createValue(value / style.effectiveZoom(), CSSPrimitiveValue::CSS_NUMBER); } -static PassRefPtr<CSSValue> zoomAdjustedPixelValueForLength(const Length& length, const RenderStyle* style) +static Ref<CSSValue> zoomAdjustedPixelValueForLength(const Length& length, const RenderStyle& style) { if (length.isFixed()) return zoomAdjustedPixelValue(length.value(), style); - return cssValuePool().createValue(length); + return CSSValuePool::singleton().createValue(length, style); } -static PassRefPtr<CSSValue> valueForReflection(const StyleReflection* reflection, const RenderStyle* style) +static Ref<CSSValue> valueForReflection(const StyleReflection* reflection, const RenderStyle& style) { if (!reflection) - return cssValuePool().createIdentifierValue(CSSValueNone); + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); RefPtr<CSSPrimitiveValue> offset; - if (reflection->offset().isPercent()) - offset = cssValuePool().createValue(reflection->offset().percent(), CSSPrimitiveValue::CSS_PERCENTAGE); + if (reflection->offset().isPercentOrCalculated()) + offset = CSSValuePool::singleton().createValue(reflection->offset().percent(), CSSPrimitiveValue::CSS_PERCENTAGE); else offset = zoomAdjustedPixelValue(reflection->offset().value(), style); RefPtr<CSSPrimitiveValue> direction; switch (reflection->direction()) { case ReflectionBelow: - direction = cssValuePool().createIdentifierValue(CSSValueBelow); + direction = CSSValuePool::singleton().createIdentifierValue(CSSValueBelow); break; case ReflectionAbove: - direction = cssValuePool().createIdentifierValue(CSSValueAbove); + direction = CSSValuePool::singleton().createIdentifierValue(CSSValueAbove); break; case ReflectionLeft: - direction = cssValuePool().createIdentifierValue(CSSValueLeft); + direction = CSSValuePool::singleton().createIdentifierValue(CSSValueLeft); break; case ReflectionRight: - direction = cssValuePool().createIdentifierValue(CSSValueRight); + direction = CSSValuePool::singleton().createIdentifierValue(CSSValueRight); break; } return CSSReflectValue::create(direction.release(), offset.release(), valueForNinePieceImage(reflection->mask())); } -static PassRefPtr<CSSValueList> createPositionListForLayer(CSSPropertyID propertyID, const FillLayer* layer, const RenderStyle* style) +static Ref<CSSValueList> createPositionListForLayer(CSSPropertyID propertyID, const FillLayer* layer, const RenderStyle& style) { - RefPtr<CSSValueList> positionList = CSSValueList::createSpaceSeparated(); + auto positionList = CSSValueList::createSpaceSeparated(); if (layer->isBackgroundOriginSet()) { ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPosition || propertyID == CSSPropertyWebkitMaskPosition); - positionList->append(cssValuePool().createValue(layer->backgroundXOrigin())); + positionList.get().append(CSSValuePool::singleton().createValue(layer->backgroundXOrigin())); } - positionList->append(zoomAdjustedPixelValueForLength(layer->xPosition(), style)); + positionList.get().append(zoomAdjustedPixelValueForLength(layer->xPosition(), style)); if (layer->isBackgroundOriginSet()) { ASSERT(propertyID == CSSPropertyBackgroundPosition || propertyID == CSSPropertyWebkitMaskPosition); - positionList->append(cssValuePool().createValue(layer->backgroundYOrigin())); + positionList.get().append(CSSValuePool::singleton().createValue(layer->backgroundYOrigin())); } - positionList->append(zoomAdjustedPixelValueForLength(layer->yPosition(), style)); - return positionList.release(); + positionList.get().append(zoomAdjustedPixelValueForLength(layer->yPosition(), style)); + return positionList; } -static PassRefPtr<CSSValue> getPositionOffsetValue(RenderStyle* style, CSSPropertyID propertyID, RenderView* renderView) +static RefPtr<CSSValue> positionOffsetValue(RenderStyle& style, CSSPropertyID propertyID) { - if (!style) - return 0; - - Length l; + Length length; switch (propertyID) { case CSSPropertyLeft: - l = style->left(); + length = style.left(); break; case CSSPropertyRight: - l = style->right(); + length = style.right(); break; case CSSPropertyTop: - l = style->top(); + length = style.top(); break; case CSSPropertyBottom: - l = style->bottom(); + length = style.bottom(); break; default: - return 0; + return nullptr; } - if (style->hasOutOfFlowPosition()) { - if (l.type() == WebCore::Fixed) - return zoomAdjustedPixelValue(l.value(), style); - else if (l.isViewportPercentage()) - return zoomAdjustedPixelValue(valueForLength(l, 0, renderView), style); - return cssValuePool().createValue(l); + if (style.hasOutOfFlowPosition()) { + if (length.isFixed()) + return zoomAdjustedPixelValue(length.value(), style); + + return CSSValuePool::singleton().createValue(length); } - if (style->hasInFlowPosition()) { + if (style.hasInFlowPosition()) { // FIXME: It's not enough to simply return "auto" values for one offset if the other side is defined. // In other words if left is auto and right is not auto, then left's computed value is negative right(). // So we should get the opposite length unit and see if it is auto. - return cssValuePool().createValue(l); + return CSSValuePool::singleton().createValue(length); } - return cssValuePool().createIdentifierValue(CSSValueAuto); + return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto); } -PassRefPtr<CSSPrimitiveValue> ComputedStyleExtractor::currentColorOrValidColor(RenderStyle* style, const Color& color) const +RefPtr<CSSPrimitiveValue> ComputedStyleExtractor::currentColorOrValidColor(RenderStyle* style, const Color& color) const { // This function does NOT look at visited information, so that computed style doesn't expose that. if (!color.isValid()) - return cssValuePool().createColorValue(style->color().rgb()); - return cssValuePool().createColorValue(color.rgb()); + return CSSValuePool::singleton().createColorValue(style->color().rgb()); + return CSSValuePool::singleton().createColorValue(color.rgb()); } -static PassRefPtr<CSSValueList> getBorderRadiusCornerValues(LengthSize radius, const RenderStyle* style, RenderView* renderView) +static Ref<CSSPrimitiveValue> percentageOrZoomAdjustedValue(Length length, const RenderStyle& style) { - RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - if (radius.width().type() == Percent) - list->append(cssValuePool().createValue(radius.width().percent(), CSSPrimitiveValue::CSS_PERCENTAGE)); - else - list->append(zoomAdjustedPixelValue(valueForLength(radius.width(), 0, renderView), style)); - if (radius.height().type() == Percent) - list->append(cssValuePool().createValue(radius.height().percent(), CSSPrimitiveValue::CSS_PERCENTAGE)); - else - list->append(zoomAdjustedPixelValue(valueForLength(radius.height(), 0, renderView), style)); - return list.release(); + if (length.isPercent()) + return CSSValuePool::singleton().createValue(length.percent(), CSSPrimitiveValue::CSS_PERCENTAGE); + + return zoomAdjustedPixelValue(valueForLength(length, 0), style); } -static PassRefPtr<CSSValue> getBorderRadiusCornerValue(LengthSize radius, const RenderStyle* style, RenderView* renderView) +static Ref<CSSPrimitiveValue> autoOrZoomAdjustedValue(Length length, const RenderStyle& style) { - if (radius.width() == radius.height()) { - if (radius.width().type() == Percent) - return cssValuePool().createValue(radius.width().percent(), CSSPrimitiveValue::CSS_PERCENTAGE); - return zoomAdjustedPixelValue(valueForLength(radius.width(), 0, renderView), style); - } - return getBorderRadiusCornerValues(radius, style, renderView); + if (length.isAuto()) + return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto); + + return zoomAdjustedPixelValue(valueForLength(length, 0), style); } -static PassRefPtr<CSSValueList> getBorderRadiusShorthandValue(const RenderStyle* style, RenderView* renderView) +static Ref<CSSValueList> getBorderRadiusCornerValues(const LengthSize& radius, const RenderStyle& style) { - RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); - bool showHorizontalBottomLeft = style->borderTopRightRadius().width() != style->borderBottomLeftRadius().width(); - bool showHorizontalBottomRight = style->borderBottomRightRadius().width() != style->borderTopLeftRadius().width(); - bool showHorizontalTopRight = style->borderTopRightRadius().width() != style->borderTopLeftRadius().width(); + auto list = CSSValueList::createSpaceSeparated(); + list.get().append(percentageOrZoomAdjustedValue(radius.width(), style)); + list.get().append(percentageOrZoomAdjustedValue(radius.height(), style)); + return list; +} + +static Ref<CSSValue> getBorderRadiusCornerValue(const LengthSize& radius, const RenderStyle& style) +{ + if (radius.width() == radius.height()) + return percentageOrZoomAdjustedValue(radius.width(), style); + + return getBorderRadiusCornerValues(radius, style); +} + +static Ref<CSSValueList> getBorderRadiusShorthandValue(const RenderStyle& style) +{ + auto list = CSSValueList::createSlashSeparated(); + bool showHorizontalBottomLeft = style.borderTopRightRadius().width() != style.borderBottomLeftRadius().width(); + bool showHorizontalBottomRight = showHorizontalBottomLeft || (style.borderBottomRightRadius().width() != style.borderTopLeftRadius().width()); + bool showHorizontalTopRight = showHorizontalBottomRight || (style.borderTopRightRadius().width() != style.borderTopLeftRadius().width()); - bool showVerticalBottomLeft = style->borderTopRightRadius().height() != style->borderBottomLeftRadius().height(); - bool showVerticalBottomRight = (style->borderBottomRightRadius().height() != style->borderTopLeftRadius().height()) || showVerticalBottomLeft; - bool showVerticalTopRight = (style->borderTopRightRadius().height() != style->borderTopLeftRadius().height()) || showVerticalBottomRight; - bool showVerticalTopLeft = (style->borderTopLeftRadius().width() != style->borderTopLeftRadius().height()); + bool showVerticalBottomLeft = style.borderTopRightRadius().height() != style.borderBottomLeftRadius().height(); + bool showVerticalBottomRight = showVerticalBottomLeft || (style.borderBottomRightRadius().height() != style.borderTopLeftRadius().height()); + bool showVerticalTopRight = showVerticalBottomRight || (style.borderTopRightRadius().height() != style.borderTopLeftRadius().height()); - RefPtr<CSSValueList> topLeftRadius = getBorderRadiusCornerValues(style->borderTopLeftRadius(), style, renderView); - RefPtr<CSSValueList> topRightRadius = getBorderRadiusCornerValues(style->borderTopRightRadius(), style, renderView); - RefPtr<CSSValueList> bottomRightRadius = getBorderRadiusCornerValues(style->borderBottomRightRadius(), style, renderView); - RefPtr<CSSValueList> bottomLeftRadius = getBorderRadiusCornerValues(style->borderBottomLeftRadius(), style, renderView); + RefPtr<CSSValueList> topLeftRadius = getBorderRadiusCornerValues(style.borderTopLeftRadius(), style); + RefPtr<CSSValueList> topRightRadius = getBorderRadiusCornerValues(style.borderTopRightRadius(), style); + RefPtr<CSSValueList> bottomRightRadius = getBorderRadiusCornerValues(style.borderBottomRightRadius(), style); + RefPtr<CSSValueList> bottomLeftRadius = getBorderRadiusCornerValues(style.borderBottomLeftRadius(), style); RefPtr<CSSValueList> horizontalRadii = CSSValueList::createSpaceSeparated(); - horizontalRadii->append(topLeftRadius->item(0)); + horizontalRadii->append(*topLeftRadius->item(0)); if (showHorizontalTopRight) - horizontalRadii->append(topRightRadius->item(0)); + horizontalRadii->append(*topRightRadius->item(0)); if (showHorizontalBottomRight) - horizontalRadii->append(bottomRightRadius->item(0)); + horizontalRadii->append(*bottomRightRadius->item(0)); if (showHorizontalBottomLeft) - horizontalRadii->append(bottomLeftRadius->item(0)); + horizontalRadii->append(*bottomLeftRadius->item(0)); - list->append(horizontalRadii.release()); + list.get().append(horizontalRadii.releaseNonNull()); - if (showVerticalTopLeft) { - RefPtr<CSSValueList> verticalRadii = CSSValueList::createSpaceSeparated(); - verticalRadii->append(topLeftRadius->item(1)); - if (showVerticalTopRight) - verticalRadii->append(topRightRadius->item(1)); - if (showVerticalBottomRight) - verticalRadii->append(bottomRightRadius->item(1)); - if (showVerticalBottomLeft) - verticalRadii->append(bottomLeftRadius->item(1)); - list->append(verticalRadii.release()); - } - return list.release(); + RefPtr<CSSValueList> verticalRadiiList = CSSValueList::createSpaceSeparated(); + verticalRadiiList->append(*topLeftRadius->item(1)); + if (showVerticalTopRight) + verticalRadiiList->append(*topRightRadius->item(1)); + if (showVerticalBottomRight) + verticalRadiiList->append(*bottomRightRadius->item(1)); + if (showVerticalBottomLeft) + verticalRadiiList->append(*bottomLeftRadius->item(1)); + + if (!verticalRadiiList->equals(downcast<CSSValueList>(*list.get().item(0)))) + list.get().append(verticalRadiiList.releaseNonNull()); + + return list; } -static LayoutRect sizingBox(RenderObject* renderer) +static LayoutRect sizingBox(RenderObject& renderer) { - if (!renderer->isBox()) + if (!is<RenderBox>(renderer)) return LayoutRect(); - RenderBox* box = toRenderBox(renderer); - return box->style()->boxSizing() == BORDER_BOX ? box->borderBoxRect() : box->computedCSSContentBoxRect(); + auto& box = downcast<RenderBox>(renderer); + return box.style().boxSizing() == BORDER_BOX ? box.borderBoxRect() : box.computedCSSContentBoxRect(); } -static PassRefPtr<WebKitCSSTransformValue> matrixTransformValue(const TransformationMatrix& transform, const RenderStyle* style) +static Ref<WebKitCSSTransformValue> matrixTransformValue(const TransformationMatrix& transform, const RenderStyle& style) { RefPtr<WebKitCSSTransformValue> transformValue; + auto& cssValuePool = CSSValuePool::singleton(); if (transform.isAffine()) { transformValue = WebKitCSSTransformValue::create(WebKitCSSTransformValue::MatrixTransformOperation); - transformValue->append(cssValuePool().createValue(transform.a(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.b(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.c(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.d(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.a(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.b(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.c(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.d(), CSSPrimitiveValue::CSS_NUMBER)); transformValue->append(zoomAdjustedNumberValue(transform.e(), style)); transformValue->append(zoomAdjustedNumberValue(transform.f(), style)); } else { transformValue = WebKitCSSTransformValue::create(WebKitCSSTransformValue::Matrix3DTransformOperation); - transformValue->append(cssValuePool().createValue(transform.m11(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m12(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m13(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m14(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m11(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m12(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m13(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m14(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m21(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m22(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m23(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m24(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m21(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m22(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m23(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m24(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m31(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m32(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m33(), CSSPrimitiveValue::CSS_NUMBER)); - transformValue->append(cssValuePool().createValue(transform.m34(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m31(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m32(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m33(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m34(), CSSPrimitiveValue::CSS_NUMBER)); transformValue->append(zoomAdjustedNumberValue(transform.m41(), style)); transformValue->append(zoomAdjustedNumberValue(transform.m42(), style)); transformValue->append(zoomAdjustedNumberValue(transform.m43(), style)); - transformValue->append(cssValuePool().createValue(transform.m44(), CSSPrimitiveValue::CSS_NUMBER)); + transformValue->append(cssValuePool.createValue(transform.m44(), CSSPrimitiveValue::CSS_NUMBER)); } - return transformValue.release(); + return transformValue.releaseNonNull(); } -static PassRefPtr<CSSValue> computedTransform(RenderObject* renderer, const RenderStyle* style) +static Ref<CSSValue> computedTransform(RenderObject* renderer, const RenderStyle& style) { - if (!renderer || !renderer->hasTransform() || !style->hasTransform()) - return cssValuePool().createIdentifierValue(CSSValueNone); + if (!renderer || !renderer->hasTransform()) + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); - IntRect box; - if (renderer->isBox()) - box = pixelSnappedIntRect(toRenderBox(renderer)->borderBoxRect()); + FloatRect pixelSnappedRect; + if (is<RenderBox>(*renderer)) + pixelSnappedRect = snapRectToDevicePixels(downcast<RenderBox>(*renderer).borderBoxRect(), renderer->document().deviceScaleFactor()); TransformationMatrix transform; - style->applyTransform(transform, box.size(), RenderStyle::ExcludeTransformOrigin); - // Note that this does not flatten to an affine transform if ENABLE(3D_RENDERING) is off, by design. + style.applyTransform(transform, pixelSnappedRect, RenderStyle::ExcludeTransformOrigin); + // Note that this does not flatten to an affine transform if ENABLE(3D_TRANSFORMS) is off, by design. // FIXME: Need to print out individual functions (https://bugs.webkit.org/show_bug.cgi?id=23924) - RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - list->append(matrixTransformValue(transform, style)); - - return list.release(); -} - -#if ENABLE(CSS_SHADERS) -static PassRefPtr<CSSValue> valueForCustomFilterArrayParameter(const CustomFilterArrayParameter* arrayParameter) -{ - RefPtr<WebKitCSSArrayFunctionValue> arrayParameterValue = WebKitCSSArrayFunctionValue::create(); - for (unsigned i = 0, size = arrayParameter->size(); i < size; ++i) - arrayParameterValue->append(cssValuePool().createValue(arrayParameter->valueAt(i), CSSPrimitiveValue::CSS_NUMBER)); - return arrayParameterValue.release(); -} - -static PassRefPtr<CSSValue> valueForCustomFilterMatParameter(const CustomFilterArrayParameter* matrixParameter) -{ - RefPtr<WebKitCSSMatFunctionValue> matrixParameterValue = WebKitCSSMatFunctionValue::create(); - for (unsigned i = 0, size = matrixParameter->size(); i < size; ++i) - matrixParameterValue->append(cssValuePool().createValue(matrixParameter->valueAt(i), CSSPrimitiveValue::CSS_NUMBER)); - return matrixParameterValue.release(); + auto list = CSSValueList::createSpaceSeparated(); + list.get().append(matrixTransformValue(transform, style)); + return WTFMove(list); } -static PassRefPtr<CSSValue> valueForCustomFilterColorParameter(const CustomFilterColorParameter* colorParameter) +static inline Ref<CSSPrimitiveValue> adjustLengthForZoom(double length, const RenderStyle& style, AdjustPixelValuesForComputedStyle adjust) { - RefPtr<CSSValueList> colorParameterValue = CSSValueList::createSpaceSeparated(); - colorParameterValue->append(cssValuePool().createColorValue(colorParameter->color().rgb())); - return colorParameterValue.release(); + return adjust == AdjustPixelValues ? zoomAdjustedPixelValue(length, style) : CSSValuePool::singleton().createValue(length, CSSPrimitiveValue::CSS_PX); } -static PassRefPtr<CSSValue> valueForCustomFilterNumberParameter(const CustomFilterNumberParameter* numberParameter) +static inline Ref<CSSPrimitiveValue> adjustLengthForZoom(const Length& length, const RenderStyle& style, AdjustPixelValuesForComputedStyle adjust) { - RefPtr<CSSValueList> numberParameterValue = CSSValueList::createSpaceSeparated(); - for (unsigned i = 0; i < numberParameter->size(); ++i) - numberParameterValue->append(cssValuePool().createValue(numberParameter->valueAt(i), CSSPrimitiveValue::CSS_NUMBER)); - return numberParameterValue.release(); + return adjust == AdjustPixelValues ? zoomAdjustedPixelValue(length.value(), style) : CSSValuePool::singleton().createValue(length); } -static PassRefPtr<CSSValue> valueForCustomFilterTransformParameter(const RenderObject* renderer, const RenderStyle* style, const CustomFilterTransformParameter* transformParameter) +Ref<CSSValue> ComputedStyleExtractor::valueForShadow(const ShadowData* shadow, CSSPropertyID propertyID, const RenderStyle& style, AdjustPixelValuesForComputedStyle adjust) { - IntSize size; - if (renderer && renderer->isBox()) - size = pixelSnappedIntRect(toRenderBox(renderer)->borderBoxRect()).size(); - - TransformationMatrix transform; - transformParameter->applyTransform(transform, size); - // FIXME: Need to print out individual functions (https://bugs.webkit.org/show_bug.cgi?id=23924) - return matrixTransformValue(transform, style); -} - -static PassRefPtr<CSSValue> valueForCustomFilterParameter(const RenderObject* renderer, const RenderStyle* style, const CustomFilterParameter* parameter) -{ - // FIXME: Add here computed style for the other types: boolean, transform, matrix, texture. - ASSERT(parameter); - switch (parameter->parameterType()) { - case CustomFilterParameter::ARRAY: - return valueForCustomFilterArrayParameter(static_cast<const CustomFilterArrayParameter*>(parameter)); - case CustomFilterParameter::COLOR: - return valueForCustomFilterColorParameter(static_cast<const CustomFilterColorParameter*>(parameter)); - case CustomFilterParameter::MATRIX: - return valueForCustomFilterMatParameter(static_cast<const CustomFilterArrayParameter*>(parameter)); - case CustomFilterParameter::NUMBER: - return valueForCustomFilterNumberParameter(static_cast<const CustomFilterNumberParameter*>(parameter)); - case CustomFilterParameter::TRANSFORM: - return valueForCustomFilterTransformParameter(renderer, style, static_cast<const CustomFilterTransformParameter*>(parameter)); + auto& cssValuePool = CSSValuePool::singleton(); + if (!shadow) + return cssValuePool.createIdentifierValue(CSSValueNone); + + auto list = CSSValueList::createCommaSeparated(); + for (const ShadowData* currShadowData = shadow; currShadowData; currShadowData = currShadowData->next()) { + RefPtr<CSSPrimitiveValue> x = adjustLengthForZoom(currShadowData->x(), style, adjust); + RefPtr<CSSPrimitiveValue> y = adjustLengthForZoom(currShadowData->y(), style, adjust); + RefPtr<CSSPrimitiveValue> blur = adjustLengthForZoom(currShadowData->radius(), style, adjust); + RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? PassRefPtr<CSSPrimitiveValue>() : adjustLengthForZoom(currShadowData->spread(), style, adjust); + RefPtr<CSSPrimitiveValue> style = propertyID == CSSPropertyTextShadow || currShadowData->style() == Normal ? PassRefPtr<CSSPrimitiveValue>() : cssValuePool.createIdentifierValue(CSSValueInset); + RefPtr<CSSPrimitiveValue> color = cssValuePool.createColorValue(currShadowData->color().rgb()); + list.get().prepend(CSSShadowValue::create(x.release(), y.release(), blur.release(), spread.release(), style.release(), color.release())); } - - ASSERT_NOT_REACHED(); - return 0; + return WTFMove(list); } -#endif // ENABLE(CSS_SHADERS) -#if ENABLE(CSS_FILTERS) -PassRefPtr<CSSValue> ComputedStyleExtractor::valueForFilter(const RenderObject* renderer, const RenderStyle* style) const +Ref<CSSValue> ComputedStyleExtractor::valueForFilter(const RenderStyle& style, const FilterOperations& filterOperations, AdjustPixelValuesForComputedStyle adjust) { -#if !ENABLE(CSS_SHADERS) - UNUSED_PARAM(renderer); -#endif - if (style->filter().operations().isEmpty()) - return cssValuePool().createIdentifierValue(CSSValueNone); + auto& cssValuePool = CSSValuePool::singleton(); + if (filterOperations.operations().isEmpty()) + return cssValuePool.createIdentifierValue(CSSValueNone); - RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); + auto list = CSSValueList::createSpaceSeparated(); RefPtr<WebKitCSSFilterValue> filterValue; - Vector<RefPtr<FilterOperation> >::const_iterator end = style->filter().operations().end(); - for (Vector<RefPtr<FilterOperation> >::const_iterator it = style->filter().operations().begin(); it != end; ++it) { - FilterOperation* filterOperation = (*it).get(); - switch (filterOperation->getOperationType()) { + Vector<RefPtr<FilterOperation>>::const_iterator end = filterOperations.operations().end(); + for (Vector<RefPtr<FilterOperation>>::const_iterator it = filterOperations.operations().begin(); it != end; ++it) { + FilterOperation& filterOperation = **it; + switch (filterOperation.type()) { case FilterOperation::REFERENCE: { - ReferenceFilterOperation* referenceOperation = static_cast<ReferenceFilterOperation*>(filterOperation); + ReferenceFilterOperation& referenceOperation = downcast<ReferenceFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::ReferenceFilterOperation); - filterValue->append(cssValuePool().createValue(referenceOperation->url(), CSSPrimitiveValue::CSS_STRING)); + filterValue->append(cssValuePool.createValue(referenceOperation.url(), CSSPrimitiveValue::CSS_URI)); break; } case FilterOperation::GRAYSCALE: { - BasicColorMatrixFilterOperation* colorMatrixOperation = static_cast<BasicColorMatrixFilterOperation*>(filterOperation); + BasicColorMatrixFilterOperation& colorMatrixOperation = downcast<BasicColorMatrixFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::GrayscaleFilterOperation); - filterValue->append(cssValuePool().createValue(colorMatrixOperation->amount(), CSSPrimitiveValue::CSS_NUMBER)); + filterValue->append(cssValuePool.createValue(colorMatrixOperation.amount(), CSSPrimitiveValue::CSS_NUMBER)); break; } case FilterOperation::SEPIA: { - BasicColorMatrixFilterOperation* colorMatrixOperation = static_cast<BasicColorMatrixFilterOperation*>(filterOperation); + BasicColorMatrixFilterOperation& colorMatrixOperation = downcast<BasicColorMatrixFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::SepiaFilterOperation); - filterValue->append(cssValuePool().createValue(colorMatrixOperation->amount(), CSSPrimitiveValue::CSS_NUMBER)); + filterValue->append(cssValuePool.createValue(colorMatrixOperation.amount(), CSSPrimitiveValue::CSS_NUMBER)); break; } case FilterOperation::SATURATE: { - BasicColorMatrixFilterOperation* colorMatrixOperation = static_cast<BasicColorMatrixFilterOperation*>(filterOperation); + BasicColorMatrixFilterOperation& colorMatrixOperation = downcast<BasicColorMatrixFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::SaturateFilterOperation); - filterValue->append(cssValuePool().createValue(colorMatrixOperation->amount(), CSSPrimitiveValue::CSS_NUMBER)); + filterValue->append(cssValuePool.createValue(colorMatrixOperation.amount(), CSSPrimitiveValue::CSS_NUMBER)); break; } case FilterOperation::HUE_ROTATE: { - BasicColorMatrixFilterOperation* colorMatrixOperation = static_cast<BasicColorMatrixFilterOperation*>(filterOperation); + BasicColorMatrixFilterOperation& colorMatrixOperation = downcast<BasicColorMatrixFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::HueRotateFilterOperation); - filterValue->append(cssValuePool().createValue(colorMatrixOperation->amount(), CSSPrimitiveValue::CSS_DEG)); + filterValue->append(cssValuePool.createValue(colorMatrixOperation.amount(), CSSPrimitiveValue::CSS_DEG)); break; } case FilterOperation::INVERT: { - BasicComponentTransferFilterOperation* componentTransferOperation = static_cast<BasicComponentTransferFilterOperation*>(filterOperation); + BasicComponentTransferFilterOperation& componentTransferOperation = downcast<BasicComponentTransferFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::InvertFilterOperation); - filterValue->append(cssValuePool().createValue(componentTransferOperation->amount(), CSSPrimitiveValue::CSS_NUMBER)); + filterValue->append(cssValuePool.createValue(componentTransferOperation.amount(), CSSPrimitiveValue::CSS_NUMBER)); break; } case FilterOperation::OPACITY: { - BasicComponentTransferFilterOperation* componentTransferOperation = static_cast<BasicComponentTransferFilterOperation*>(filterOperation); + BasicComponentTransferFilterOperation& componentTransferOperation = downcast<BasicComponentTransferFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::OpacityFilterOperation); - filterValue->append(cssValuePool().createValue(componentTransferOperation->amount(), CSSPrimitiveValue::CSS_NUMBER)); + filterValue->append(cssValuePool.createValue(componentTransferOperation.amount(), CSSPrimitiveValue::CSS_NUMBER)); break; } case FilterOperation::BRIGHTNESS: { - BasicComponentTransferFilterOperation* brightnessOperation = static_cast<BasicComponentTransferFilterOperation*>(filterOperation); + BasicComponentTransferFilterOperation& brightnessOperation = downcast<BasicComponentTransferFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::BrightnessFilterOperation); - filterValue->append(cssValuePool().createValue(brightnessOperation->amount(), CSSPrimitiveValue::CSS_NUMBER)); + filterValue->append(cssValuePool.createValue(brightnessOperation.amount(), CSSPrimitiveValue::CSS_NUMBER)); break; } case FilterOperation::CONTRAST: { - BasicComponentTransferFilterOperation* contrastOperation = static_cast<BasicComponentTransferFilterOperation*>(filterOperation); + BasicComponentTransferFilterOperation& contrastOperation = downcast<BasicComponentTransferFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::ContrastFilterOperation); - filterValue->append(cssValuePool().createValue(contrastOperation->amount(), CSSPrimitiveValue::CSS_NUMBER)); + filterValue->append(cssValuePool.createValue(contrastOperation.amount(), CSSPrimitiveValue::CSS_NUMBER)); break; } case FilterOperation::BLUR: { - BlurFilterOperation* blurOperation = static_cast<BlurFilterOperation*>(filterOperation); + BlurFilterOperation& blurOperation = downcast<BlurFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::BlurFilterOperation); - filterValue->append(zoomAdjustedPixelValue(blurOperation->stdDeviation().value(), style)); + filterValue->append(adjustLengthForZoom(blurOperation.stdDeviation(), style, adjust)); break; } case FilterOperation::DROP_SHADOW: { - DropShadowFilterOperation* dropShadowOperation = static_cast<DropShadowFilterOperation*>(filterOperation); + DropShadowFilterOperation& dropShadowOperation = downcast<DropShadowFilterOperation>(filterOperation); filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::DropShadowFilterOperation); // We want our computed style to look like that of a text shadow (has neither spread nor inset style). - ShadowData shadowData = ShadowData(dropShadowOperation->location(), dropShadowOperation->stdDeviation(), 0, Normal, false, dropShadowOperation->color()); - filterValue->append(valueForShadow(&shadowData, CSSPropertyTextShadow, style)); + ShadowData shadowData = ShadowData(dropShadowOperation.location(), dropShadowOperation.stdDeviation(), 0, Normal, false, dropShadowOperation.color()); + filterValue->append(valueForShadow(&shadowData, CSSPropertyTextShadow, style, adjust)); break; } -#if ENABLE(CSS_SHADERS) - case FilterOperation::VALIDATED_CUSTOM: - // ValidatedCustomFilterOperation is not supposed to end up in the RenderStyle. - ASSERT_NOT_REACHED(); - break; - case FilterOperation::CUSTOM: { - CustomFilterOperation* customOperation = static_cast<CustomFilterOperation*>(filterOperation); - filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::CustomFilterOperation); - - // The output should be verbose, even if the values are the default ones. - - ASSERT(customOperation->program()); - StyleCustomFilterProgram* program = static_cast<StyleCustomFilterProgram*>(customOperation->program()); - - RefPtr<CSSValueList> shadersList = CSSValueList::createSpaceSeparated(); - if (program->vertexShader()) - shadersList->append(program->vertexShader()->cssValue()); - else - shadersList->append(cssValuePool().createIdentifierValue(CSSValueNone)); - - const CustomFilterProgramMixSettings mixSettings = program->mixSettings(); - if (program->fragmentShader()) { - if (program->programType() == PROGRAM_TYPE_BLENDS_ELEMENT_TEXTURE) { - RefPtr<WebKitCSSMixFunctionValue> mixFunction = WebKitCSSMixFunctionValue::create(); - mixFunction->append(program->fragmentShader()->cssValue()); - mixFunction->append(cssValuePool().createValue(mixSettings.blendMode)); - mixFunction->append(cssValuePool().createValue(mixSettings.compositeOperator)); - shadersList->append(mixFunction.release()); - } else - shadersList->append(program->fragmentShader()->cssValue()); - } - else - shadersList->append(cssValuePool().createIdentifierValue(CSSValueNone)); - - filterValue->append(shadersList.release()); - - RefPtr<CSSValueList> meshParameters = CSSValueList::createSpaceSeparated(); - meshParameters->append(cssValuePool().createValue(customOperation->meshColumns(), CSSPrimitiveValue::CSS_NUMBER)); - meshParameters->append(cssValuePool().createValue(customOperation->meshRows(), CSSPrimitiveValue::CSS_NUMBER)); - - // FIXME: The specification doesn't have any "attached" identifier. Should we add one? - // https://bugs.webkit.org/show_bug.cgi?id=72700 - if (customOperation->meshType() == MeshTypeDetached) - meshParameters->append(cssValuePool().createIdentifierValue(CSSValueDetached)); - - filterValue->append(meshParameters.release()); - - const CustomFilterParameterList& parameters = customOperation->parameters(); - size_t parametersSize = parameters.size(); - if (!parametersSize) - break; - RefPtr<CSSValueList> parametersCSSValue = CSSValueList::createCommaSeparated(); - for (size_t i = 0; i < parametersSize; ++i) { - const CustomFilterParameter* parameter = parameters.at(i).get(); - RefPtr<CSSValueList> parameterCSSNameAndValue = CSSValueList::createSpaceSeparated(); - parameterCSSNameAndValue->append(cssValuePool().createValue(parameter->name(), CSSPrimitiveValue::CSS_STRING)); - parameterCSSNameAndValue->append(valueForCustomFilterParameter(renderer, style, parameter)); - parametersCSSValue->append(parameterCSSNameAndValue.release()); - } - - filterValue->append(parametersCSSValue.release()); - break; - } -#endif default: filterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::UnknownFilterOperation); break; } - list->append(filterValue.release()); + list.get().append(filterValue.releaseNonNull()); } - return list.release(); + return WTFMove(list); } -#endif -static PassRefPtr<CSSValue> valueForGridTrackBreadth(const Length& trackBreadth, const RenderStyle* style, RenderView *renderView) +#if ENABLE(CSS_GRID_LAYOUT) +static Ref<CSSValue> specifiedValueForGridTrackBreadth(const GridLength& trackBreadth, const RenderStyle& style) { - if (trackBreadth.isAuto()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - if (trackBreadth.isViewportPercentage()) - return zoomAdjustedPixelValue(valueForLength(trackBreadth, 0, renderView), style); - return zoomAdjustedPixelValueForLength(trackBreadth, style); + if (!trackBreadth.isLength()) + return CSSValuePool::singleton().createValue(trackBreadth.flex(), CSSPrimitiveValue::CSS_FR); + + const Length& trackBreadthLength = trackBreadth.length(); + if (trackBreadthLength.isAuto()) + return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto); + return zoomAdjustedPixelValueForLength(trackBreadthLength, style); } -static PassRefPtr<CSSValue> valueForGridTrackSize(const GridTrackSize& trackSize, const RenderStyle* style, RenderView* renderView) +static Ref<CSSValue> specifiedValueForGridTrackSize(const GridTrackSize& trackSize, const RenderStyle& style) { switch (trackSize.type()) { case LengthTrackSizing: - return valueForGridTrackBreadth(trackSize.length(), style, renderView); - case MinMaxTrackSizing: + return specifiedValueForGridTrackBreadth(trackSize.length(), style); + default: + ASSERT(trackSize.type() == MinMaxTrackSizing); RefPtr<CSSValueList> minMaxTrackBreadths = CSSValueList::createCommaSeparated(); - minMaxTrackBreadths->append(valueForGridTrackBreadth(trackSize.minTrackBreadth(), style, renderView)); - minMaxTrackBreadths->append(valueForGridTrackBreadth(trackSize.maxTrackBreadth(), style, renderView)); + minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.minTrackBreadth(), style)); + minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.maxTrackBreadth(), style)); return CSSFunctionValue::create("minmax(", minMaxTrackBreadths); } - ASSERT_NOT_REACHED(); - return 0; } -static PassRefPtr<CSSValue> valueForGridTrackList(const Vector<GridTrackSize>& trackSizes, const RenderStyle* style, RenderView *renderView) +static void addValuesForNamedGridLinesAtIndex(const OrderedNamedGridLinesMap& orderedNamedGridLines, size_t i, CSSValueList& list) { - // Handle the 'none' case here. - if (!trackSizes.size()) - return cssValuePool().createIdentifierValue(CSSValueNone); + const Vector<String>& namedGridLines = orderedNamedGridLines.get(i); + if (namedGridLines.isEmpty()) + return; - RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - for (size_t i = 0; i < trackSizes.size(); ++i) - list->append(valueForGridTrackSize(trackSizes[i], style, renderView)); - return list.release(); + auto& cssValuePool = CSSValuePool::singleton(); + RefPtr<CSSGridLineNamesValue> lineNames = CSSGridLineNamesValue::create(); + for (auto& name : namedGridLines) + lineNames->append(cssValuePool.createValue(name, CSSPrimitiveValue::CSS_STRING)); + list.append(lineNames.releaseNonNull()); +} + +static Ref<CSSValue> valueForGridTrackList(GridTrackSizingDirection direction, RenderObject* renderer, const RenderStyle& style) +{ + const Vector<GridTrackSize>& trackSizes = direction == ForColumns ? style.gridColumns() : style.gridRows(); + const OrderedNamedGridLinesMap& orderedNamedGridLines = direction == ForColumns ? style.orderedNamedGridColumnLines() : style.orderedNamedGridRowLines(); + bool isRenderGrid = is<RenderGrid>(renderer); + + // Handle the 'none' case. + bool trackListIsEmpty = trackSizes.isEmpty(); + if (isRenderGrid && trackListIsEmpty) { + // For grids we should consider every listed track, whether implicitly or explicitly created. If we don't have + // any explicit track and there are no children then there are no implicit tracks. We cannot simply check the + // number of rows/columns in our internal grid representation because it's always at least 1x1 (see r143331). + trackListIsEmpty = !downcast<RenderBlock>(*renderer).firstChild(); + } + + if (trackListIsEmpty) { + ASSERT(orderedNamedGridLines.isEmpty()); + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); + } + + auto list = CSSValueList::createSpaceSeparated(); + unsigned insertionIndex; + if (isRenderGrid) { + const Vector<LayoutUnit>& trackPositions = direction == ForColumns ? downcast<RenderGrid>(*renderer).columnPositions() : downcast<RenderGrid>(*renderer).rowPositions(); + // There are at least #tracks + 1 grid lines (trackPositions). Apart from that, the grid container can generate implicit grid tracks, + // so we'll have more trackPositions than trackSizes as the latter only contain the explicit grid. + ASSERT(trackPositions.size() - 1 >= trackSizes.size()); + + unsigned i = 0; + LayoutUnit gutterSize = downcast<RenderGrid>(*renderer).guttersSize(direction, 2); + for (; i < trackPositions.size() - 2; ++i) { + addValuesForNamedGridLinesAtIndex(orderedNamedGridLines, i, list.get()); + list.get().append(zoomAdjustedPixelValue(trackPositions[i + 1] - trackPositions[i] - gutterSize, style)); + } + // Last track line does not have any gutter. + addValuesForNamedGridLinesAtIndex(orderedNamedGridLines, i, list.get()); + list.get().append(zoomAdjustedPixelValue(trackPositions[i + 1] - trackPositions[i], style)); + insertionIndex = trackPositions.size() - 1; + } else { + for (unsigned i = 0; i < trackSizes.size(); ++i) { + addValuesForNamedGridLinesAtIndex(orderedNamedGridLines, i, list.get()); + list.get().append(specifiedValueForGridTrackSize(trackSizes[i], style)); + } + insertionIndex = trackSizes.size(); + } + + // Those are the trailing <ident>* allowed in the syntax. + addValuesForNamedGridLinesAtIndex(orderedNamedGridLines, insertionIndex, list.get()); + return WTFMove(list); } -static PassRefPtr<CSSValue> valueForGridPosition(const GridPosition& position) +static Ref<CSSValue> valueForGridPosition(const GridPosition& position) { + auto& cssValuePool = CSSValuePool::singleton(); if (position.isAuto()) - return cssValuePool().createIdentifierValue(CSSValueAuto); + return cssValuePool.createIdentifierValue(CSSValueAuto); + + if (position.isNamedGridArea()) + return cssValuePool.createValue(position.namedGridLine(), CSSPrimitiveValue::CSS_STRING); + + auto list = CSSValueList::createSpaceSeparated(); + if (position.isSpan()) { + list.get().append(cssValuePool.createIdentifierValue(CSSValueSpan)); + list.get().append(cssValuePool.createValue(position.spanPosition(), CSSPrimitiveValue::CSS_NUMBER)); + } else + list.get().append(cssValuePool.createValue(position.integerPosition(), CSSPrimitiveValue::CSS_NUMBER)); - return cssValuePool().createValue(position.integerPosition(), CSSPrimitiveValue::CSS_NUMBER); + if (!position.namedGridLine().isNull()) + list.get().append(cssValuePool.createValue(position.namedGridLine(), CSSPrimitiveValue::CSS_STRING)); + return WTFMove(list); } -static PassRefPtr<CSSValue> createTransitionPropertyValue(const Animation* animation) +#endif + +static Ref<CSSValue> createTransitionPropertyValue(const Animation& animation) { - RefPtr<CSSValue> propertyValue; - if (animation->animationMode() == Animation::AnimateNone) - propertyValue = cssValuePool().createIdentifierValue(CSSValueNone); - else if (animation->animationMode() == Animation::AnimateAll) - propertyValue = cssValuePool().createIdentifierValue(CSSValueAll); - else - propertyValue = cssValuePool().createValue(getPropertyNameString(animation->property()), CSSPrimitiveValue::CSS_STRING); - return propertyValue.release(); + if (animation.animationMode() == Animation::AnimateNone) + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); + if (animation.animationMode() == Animation::AnimateAll) + return CSSValuePool::singleton().createIdentifierValue(CSSValueAll); + return CSSValuePool::singleton().createValue(getPropertyNameString(animation.property()), CSSPrimitiveValue::CSS_STRING); } -static PassRefPtr<CSSValue> getTransitionPropertyValue(const AnimationList* animList) + +static Ref<CSSValueList> getTransitionPropertyValue(const AnimationList* animList) { - RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); + auto list = CSSValueList::createCommaSeparated(); if (animList) { for (size_t i = 0; i < animList->size(); ++i) - list->append(createTransitionPropertyValue(animList->animation(i))); + list.get().append(createTransitionPropertyValue(animList->animation(i))); } else - list->append(cssValuePool().createIdentifierValue(CSSValueAll)); - return list.release(); + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueAll)); + return list; +} + +#if ENABLE(CSS_SCROLL_SNAP) +static Ref<CSSValueList> scrollSnapDestination(RenderStyle& style, const LengthSize& destination) +{ + auto list = CSSValueList::createSpaceSeparated(); + list.get().append(zoomAdjustedPixelValueForLength(destination.width(), style)); + list.get().append(zoomAdjustedPixelValueForLength(destination.height(), style)); + return list; +} + +static Ref<CSSValue> scrollSnapPoints(RenderStyle& style, const ScrollSnapPoints* points) +{ + if (!points) + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); + + if (points->usesElements) + return CSSValuePool::singleton().createIdentifierValue(CSSValueElements); + auto list = CSSValueList::createSpaceSeparated(); + for (auto& point : points->offsets) + list.get().append(zoomAdjustedPixelValueForLength(point, style)); + if (points->hasRepeat) + list.get().append(CSSValuePool::singleton().createValue(LengthRepeat::create(zoomAdjustedPixelValueForLength(points->repeatOffset, style)))); + return WTFMove(list); +} + +static Ref<CSSValue> scrollSnapCoordinates(RenderStyle& style, const Vector<LengthSize>& coordinates) +{ + if (coordinates.isEmpty()) + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); + + auto list = CSSValueList::createCommaSeparated(); + + for (auto& coordinate : coordinates) { + auto pair = CSSValueList::createSpaceSeparated(); + pair.get().append(zoomAdjustedPixelValueForLength(coordinate.width(), style)); + pair.get().append(zoomAdjustedPixelValueForLength(coordinate.height(), style)); + list.get().append(WTFMove(pair)); + } + + return WTFMove(list); +} +#endif + +static Ref<CSSValue> getWillChangePropertyValue(const WillChangeData* willChangeData) +{ + auto& cssValuePool = CSSValuePool::singleton(); + if (!willChangeData || !willChangeData->numFeatures()) + return cssValuePool.createIdentifierValue(CSSValueAuto); + + auto list = CSSValueList::createCommaSeparated(); + for (size_t i = 0; i < willChangeData->numFeatures(); ++i) { + WillChangeData::FeaturePropertyPair feature = willChangeData->featureAt(i); + switch (feature.first) { + case WillChangeData::ScrollPosition: + list.get().append(cssValuePool.createIdentifierValue(CSSValueScrollPosition)); + break; + case WillChangeData::Contents: + list.get().append(cssValuePool.createIdentifierValue(CSSValueContents)); + break; + case WillChangeData::Property: + list.get().append(cssValuePool.createIdentifierValue(feature.second)); + break; + case WillChangeData::Invalid: + ASSERT_NOT_REACHED(); + break; + } + } + + return WTFMove(list); +} + +static inline void appendLigaturesValue(CSSValueList& list, FontVariantLigatures value, CSSValueID yesValue, CSSValueID noValue) +{ + switch (value) { + case FontVariantLigatures::Normal: + return; + case FontVariantLigatures::No: + list.append(CSSValuePool::singleton().createIdentifierValue(noValue)); + return; + case FontVariantLigatures::Yes: + list.append(CSSValuePool::singleton().createIdentifierValue(yesValue)); + return; + } + ASSERT_NOT_REACHED(); +} + +static Ref<CSSValue> fontVariantLigaturesPropertyValue(FontVariantLigatures common, FontVariantLigatures discretionary, FontVariantLigatures historical, FontVariantLigatures contextualAlternates) +{ + auto& cssValuePool = CSSValuePool::singleton(); + if (common == FontVariantLigatures::No && discretionary == FontVariantLigatures::No && historical == FontVariantLigatures::No && contextualAlternates == FontVariantLigatures::No) + return cssValuePool.createIdentifierValue(CSSValueNone); + if (common == FontVariantLigatures::Normal && discretionary == FontVariantLigatures::Normal && historical == FontVariantLigatures::Normal && contextualAlternates == FontVariantLigatures::Normal) + return cssValuePool.createIdentifierValue(CSSValueNormal); + + auto valueList = CSSValueList::createSpaceSeparated(); + appendLigaturesValue(valueList, common, CSSValueCommonLigatures, CSSValueNoCommonLigatures); + appendLigaturesValue(valueList, discretionary, CSSValueDiscretionaryLigatures, CSSValueNoDiscretionaryLigatures); + appendLigaturesValue(valueList, historical, CSSValueHistoricalLigatures, CSSValueNoHistoricalLigatures); + appendLigaturesValue(valueList, contextualAlternates, CSSValueContextual, CSSValueNoContextual); + return WTFMove(valueList); +} + +static Ref<CSSValue> fontVariantPositionPropertyValue(FontVariantPosition position) +{ + auto& cssValuePool = CSSValuePool::singleton(); + CSSValueID valueID = CSSValueNormal; + switch (position) { + case FontVariantPosition::Normal: + break; + case FontVariantPosition::Subscript: + valueID = CSSValueSub; + break; + case FontVariantPosition::Superscript: + valueID = CSSValueSuper; + break; + } + return cssValuePool.createIdentifierValue(valueID); +} + +static Ref<CSSValue> fontVariantCapsPropertyValue(FontVariantCaps caps) +{ + auto& cssValuePool = CSSValuePool::singleton(); + CSSValueID valueID = CSSValueNormal; + switch (caps) { + case FontVariantCaps::Normal: + break; + case FontVariantCaps::Small: + valueID = CSSValueSmallCaps; + break; + case FontVariantCaps::AllSmall: + valueID = CSSValueAllSmallCaps; + break; + case FontVariantCaps::Petite: + valueID = CSSValuePetiteCaps; + break; + case FontVariantCaps::AllPetite: + valueID = CSSValueAllPetiteCaps; + break; + case FontVariantCaps::Unicase: + valueID = CSSValueUnicase; + break; + case FontVariantCaps::Titling: + valueID = CSSValueTitlingCaps; + break; + } + return cssValuePool.createIdentifierValue(valueID); +} + +static Ref<CSSValue> fontVariantNumericPropertyValue(FontVariantNumericFigure figure, FontVariantNumericSpacing spacing, FontVariantNumericFraction fraction, FontVariantNumericOrdinal ordinal, FontVariantNumericSlashedZero slashedZero) +{ + auto& cssValuePool = CSSValuePool::singleton(); + if (figure == FontVariantNumericFigure::Normal && spacing == FontVariantNumericSpacing::Normal && fraction == FontVariantNumericFraction::Normal && ordinal == FontVariantNumericOrdinal::Normal && slashedZero == FontVariantNumericSlashedZero::Normal) + return cssValuePool.createIdentifierValue(CSSValueNormal); + + auto valueList = CSSValueList::createSpaceSeparated(); + switch (figure) { + case FontVariantNumericFigure::Normal: + break; + case FontVariantNumericFigure::LiningNumbers: + valueList->append(cssValuePool.createIdentifierValue(CSSValueLiningNums)); + break; + case FontVariantNumericFigure::OldStyleNumbers: + valueList->append(cssValuePool.createIdentifierValue(CSSValueOldstyleNums)); + break; + } + + switch (spacing) { + case FontVariantNumericSpacing::Normal: + break; + case FontVariantNumericSpacing::ProportionalNumbers: + valueList->append(cssValuePool.createIdentifierValue(CSSValueProportionalNums)); + break; + case FontVariantNumericSpacing::TabularNumbers: + valueList->append(cssValuePool.createIdentifierValue(CSSValueTabularNums)); + break; + } + + switch (fraction) { + case FontVariantNumericFraction::Normal: + break; + case FontVariantNumericFraction::DiagonalFractions: + valueList->append(cssValuePool.createIdentifierValue(CSSValueDiagonalFractions)); + break; + case FontVariantNumericFraction::StackedFractions: + valueList->append(cssValuePool.createIdentifierValue(CSSValueStackedFractions)); + break; + } + + if (ordinal == FontVariantNumericOrdinal::Yes) + valueList->append(cssValuePool.createIdentifierValue(CSSValueOrdinal)); + if (slashedZero == FontVariantNumericSlashedZero::Yes) + valueList->append(cssValuePool.createIdentifierValue(CSSValueSlashedZero)); + + return WTFMove(valueList); +} + +static Ref<CSSValue> fontVariantAlternatesPropertyValue(FontVariantAlternates alternates) +{ + auto& cssValuePool = CSSValuePool::singleton(); + CSSValueID valueID = CSSValueNormal; + switch (alternates) { + case FontVariantAlternates::Normal: + break; + case FontVariantAlternates::HistoricalForms: + valueID = CSSValueHistoricalForms; + break; + } + return cssValuePool.createIdentifierValue(valueID); +} + +static Ref<CSSValue> fontVariantEastAsianPropertyValue(FontVariantEastAsianVariant variant, FontVariantEastAsianWidth width, FontVariantEastAsianRuby ruby) +{ + auto& cssValuePool = CSSValuePool::singleton(); + if (variant == FontVariantEastAsianVariant::Normal && width == FontVariantEastAsianWidth::Normal && ruby == FontVariantEastAsianRuby::Normal) + return cssValuePool.createIdentifierValue(CSSValueNormal); + + auto valueList = CSSValueList::createSpaceSeparated(); + switch (variant) { + case FontVariantEastAsianVariant::Normal: + break; + case FontVariantEastAsianVariant::Jis78: + valueList->append(cssValuePool.createIdentifierValue(CSSValueJis78)); + break; + case FontVariantEastAsianVariant::Jis83: + valueList->append(cssValuePool.createIdentifierValue(CSSValueJis83)); + break; + case FontVariantEastAsianVariant::Jis90: + valueList->append(cssValuePool.createIdentifierValue(CSSValueJis90)); + break; + case FontVariantEastAsianVariant::Jis04: + valueList->append(cssValuePool.createIdentifierValue(CSSValueJis04)); + break; + case FontVariantEastAsianVariant::Simplified: + valueList->append(cssValuePool.createIdentifierValue(CSSValueSimplified)); + break; + case FontVariantEastAsianVariant::Traditional: + valueList->append(cssValuePool.createIdentifierValue(CSSValueTraditional)); + break; + } + + switch (width) { + case FontVariantEastAsianWidth::Normal: + break; + case FontVariantEastAsianWidth::Full: + valueList->append(cssValuePool.createIdentifierValue(CSSValueFullWidth)); + break; + case FontVariantEastAsianWidth::Proportional: + valueList->append(cssValuePool.createIdentifierValue(CSSValueProportionalWidth)); + break; + } + + if (ruby == FontVariantEastAsianRuby::Yes) + valueList->append(cssValuePool.createIdentifierValue(CSSValueRuby)); + + return WTFMove(valueList); } -static PassRefPtr<CSSValue> getDelayValue(const AnimationList* animList) +static Ref<CSSValueList> getDelayValue(const AnimationList* animList) { - RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); + auto& cssValuePool = CSSValuePool::singleton(); + auto list = CSSValueList::createCommaSeparated(); if (animList) { for (size_t i = 0; i < animList->size(); ++i) - list->append(cssValuePool().createValue(animList->animation(i)->delay(), CSSPrimitiveValue::CSS_S)); + list.get().append(cssValuePool.createValue(animList->animation(i).delay(), CSSPrimitiveValue::CSS_S)); } else { // Note that initialAnimationDelay() is used for both transitions and animations - list->append(cssValuePool().createValue(Animation::initialAnimationDelay(), CSSPrimitiveValue::CSS_S)); + list.get().append(cssValuePool.createValue(Animation::initialDelay(), CSSPrimitiveValue::CSS_S)); } - return list.release(); + return list; } -static PassRefPtr<CSSValue> getDurationValue(const AnimationList* animList) +static Ref<CSSValueList> getDurationValue(const AnimationList* animList) { - RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); + auto& cssValuePool = CSSValuePool::singleton(); + auto list = CSSValueList::createCommaSeparated(); if (animList) { for (size_t i = 0; i < animList->size(); ++i) - list->append(cssValuePool().createValue(animList->animation(i)->duration(), CSSPrimitiveValue::CSS_S)); + list.get().append(cssValuePool.createValue(animList->animation(i).duration(), CSSPrimitiveValue::CSS_S)); } else { // Note that initialAnimationDuration() is used for both transitions and animations - list->append(cssValuePool().createValue(Animation::initialAnimationDuration(), CSSPrimitiveValue::CSS_S)); + list.get().append(cssValuePool.createValue(Animation::initialDuration(), CSSPrimitiveValue::CSS_S)); } - return list.release(); + return list; } -static PassRefPtr<CSSValue> createTimingFunctionValue(const TimingFunction* timingFunction) +static Ref<CSSValue> createTimingFunctionValue(const TimingFunction* timingFunction) { - if (timingFunction->isCubicBezierTimingFunction()) { + switch (timingFunction->type()) { + case TimingFunction::CubicBezierFunction: { const CubicBezierTimingFunction* bezierTimingFunction = static_cast<const CubicBezierTimingFunction*>(timingFunction); if (bezierTimingFunction->timingFunctionPreset() != CubicBezierTimingFunction::Custom) { CSSValueID valueId = CSSValueInvalid; @@ -1166,42 +1441,71 @@ static PassRefPtr<CSSValue> createTimingFunctionValue(const TimingFunction* timi case CubicBezierTimingFunction::EaseOut: valueId = CSSValueEaseOut; break; - case CubicBezierTimingFunction::EaseInOut: + default: + ASSERT(bezierTimingFunction->timingFunctionPreset() == CubicBezierTimingFunction::EaseInOut); valueId = CSSValueEaseInOut; break; - default: - ASSERT_NOT_REACHED(); - return 0; } - return cssValuePool().createIdentifierValue(valueId); + return CSSValuePool::singleton().createIdentifierValue(valueId); } return CSSCubicBezierTimingFunctionValue::create(bezierTimingFunction->x1(), bezierTimingFunction->y1(), bezierTimingFunction->x2(), bezierTimingFunction->y2()); } - - if (timingFunction->isStepsTimingFunction()) { + case TimingFunction::StepsFunction: { const StepsTimingFunction* stepsTimingFunction = static_cast<const StepsTimingFunction*>(timingFunction); return CSSStepsTimingFunctionValue::create(stepsTimingFunction->numberOfSteps(), stepsTimingFunction->stepAtStart()); } - - return CSSLinearTimingFunctionValue::create(); + default: + ASSERT(timingFunction->type() == TimingFunction::LinearFunction); + return CSSValuePool::singleton().createIdentifierValue(CSSValueLinear); + } } -static PassRefPtr<CSSValue> getTimingFunctionValue(const AnimationList* animList) +static Ref<CSSValueList> getTimingFunctionValue(const AnimationList* animList) { - RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); + auto list = CSSValueList::createCommaSeparated(); if (animList) { for (size_t i = 0; i < animList->size(); ++i) - list->append(createTimingFunctionValue(animList->animation(i)->timingFunction().get())); + list.get().append(createTimingFunctionValue(animList->animation(i).timingFunction().get())); } else // Note that initialAnimationTimingFunction() is used for both transitions and animations - list->append(createTimingFunctionValue(Animation::initialAnimationTimingFunction().get())); - return list.release(); + list.get().append(createTimingFunctionValue(Animation::initialTimingFunction().get())); + return list; +} + +#if ENABLE(CSS_ANIMATIONS_LEVEL_2) +static Ref<CSSValue> createAnimationTriggerValue(const AnimationTrigger* trigger, const RenderStyle& style) +{ + switch (trigger->type()) { + case AnimationTrigger::AnimationTriggerType::ScrollAnimationTriggerType: { + auto& scrollAnimationTrigger = downcast<ScrollAnimationTrigger>(*trigger); + if (scrollAnimationTrigger.endValue().isAuto()) + return CSSAnimationTriggerScrollValue::create(zoomAdjustedPixelValueForLength(scrollAnimationTrigger.startValue(), style)); + return CSSAnimationTriggerScrollValue::create(zoomAdjustedPixelValueForLength(scrollAnimationTrigger.startValue(), style), + zoomAdjustedPixelValueForLength(scrollAnimationTrigger.endValue(), style)); + } + default: + ASSERT(trigger->type() == AnimationTrigger::AnimationTriggerType::AutoAnimationTriggerType); + return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto); + } +} + +static Ref<CSSValueList> getAnimationTriggerValue(const AnimationList* animList, const RenderStyle& style) +{ + auto list = CSSValueList::createCommaSeparated(); + if (animList) { + for (size_t i = 0; i < animList->size(); ++i) + list.get().append(createAnimationTriggerValue(animList->animation(i).trigger().get(), style)); + } else + list.get().append(createAnimationTriggerValue(Animation::initialTrigger().get(), style)); + + return list; } +#endif -static PassRefPtr<CSSValue> createLineBoxContainValue(unsigned lineBoxContain) +static Ref<CSSValue> createLineBoxContainValue(unsigned lineBoxContain) { if (!lineBoxContain) - return cssValuePool().createIdentifierValue(CSSValueNone); + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); return CSSLineBoxContainValue::create(lineBoxContain); } @@ -1219,8 +1523,8 @@ CSSComputedStyleDeclaration::CSSComputedStyleDeclaration(PassRefPtr<Node> n, boo , m_refCount(1) { unsigned nameWithoutColonsStart = pseudoElementName[0] == ':' ? (pseudoElementName[1] == ':' ? 2 : 1) : 0; - m_pseudoElementSpecifier = CSSSelector::pseudoId(CSSSelector::parsePseudoType( - AtomicString(pseudoElementName.substring(nameWithoutColonsStart)))); + m_pseudoElementSpecifier = CSSSelector::pseudoId(CSSSelector::parsePseudoElementType( + (pseudoElementName.substringSharingImpl(nameWithoutColonsStart)))); } CSSComputedStyleDeclaration::~CSSComputedStyleDeclaration() @@ -1247,7 +1551,7 @@ String CSSComputedStyleDeclaration::cssText() const if (i) result.append(' '); result.append(getPropertyName(computedProperties[i])); - result.append(": ", 2); + result.appendLiteral(": "); result.append(getPropertyValue(computedProperties[i])); result.append(';'); } @@ -1260,28 +1564,21 @@ void CSSComputedStyleDeclaration::setCssText(const String&, ExceptionCode& ec) ec = NO_MODIFICATION_ALLOWED_ERR; } -static CSSValueID cssIdentifierForFontSizeKeyword(int keywordSize) -{ - ASSERT_ARG(keywordSize, keywordSize); - ASSERT_ARG(keywordSize, keywordSize <= 8); - return static_cast<CSSValueID>(CSSValueXxSmall + keywordSize - 1); -} - -PassRefPtr<CSSPrimitiveValue> ComputedStyleExtractor::getFontSizeCSSValuePreferringKeyword() const +RefPtr<CSSPrimitiveValue> ComputedStyleExtractor::getFontSizeCSSValuePreferringKeyword() const { if (!m_node) - return 0; + return nullptr; - m_node->document()->updateLayoutIgnorePendingStylesheets(); + m_node->document().updateLayoutIgnorePendingStylesheets(); RefPtr<RenderStyle> style = m_node->computedStyle(m_pseudoElementSpecifier); if (!style) - return 0; + return nullptr; - if (int keywordSize = style->fontDescription().keywordSize()) - return cssValuePool().createIdentifierValue(cssIdentifierForFontSizeKeyword(keywordSize)); + if (CSSValueID sizeIdentifier = style->fontDescription().keywordSizeAsIdentifier()) + return CSSValuePool::singleton().createIdentifierValue(sizeIdentifier); - return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), style.get()); + return zoomAdjustedPixelValue(style->fontDescription().computedSize(), *style); } bool ComputedStyleExtractor::useFixedFontDefaultSize() const @@ -1296,23 +1593,6 @@ bool ComputedStyleExtractor::useFixedFontDefaultSize() const return style->fontDescription().useFixedDefaultSize(); } -PassRefPtr<CSSValue> ComputedStyleExtractor::valueForShadow(const ShadowData* shadow, CSSPropertyID propertyID, const RenderStyle* style) const -{ - if (!shadow) - return cssValuePool().createIdentifierValue(CSSValueNone); - - RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); - for (const ShadowData* s = shadow; s; s = s->next()) { - RefPtr<CSSPrimitiveValue> x = zoomAdjustedPixelValue(s->x(), style); - RefPtr<CSSPrimitiveValue> y = zoomAdjustedPixelValue(s->y(), style); - RefPtr<CSSPrimitiveValue> blur = zoomAdjustedPixelValue(s->radius(), style); - RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? PassRefPtr<CSSPrimitiveValue>() : zoomAdjustedPixelValue(s->spread(), style); - RefPtr<CSSPrimitiveValue> style = propertyID == CSSPropertyTextShadow || s->style() == Normal ? PassRefPtr<CSSPrimitiveValue>() : cssValuePool().createIdentifierValue(CSSValueInset); - RefPtr<CSSPrimitiveValue> color = cssValuePool().createColorValue(s->color().rgb()); - list->prepend(ShadowValue::create(x.release(), y.release(), blur.release(), spread.release(), style.release(), color.release())); - } - return list.release(); -} static CSSValueID identifierForFamily(const AtomicString& family) { @@ -1331,205 +1611,471 @@ static CSSValueID identifierForFamily(const AtomicString& family) return CSSValueInvalid; } -static PassRefPtr<CSSPrimitiveValue> valueForFamily(const AtomicString& family) +static Ref<CSSPrimitiveValue> valueForFamily(const AtomicString& family) { if (CSSValueID familyIdentifier = identifierForFamily(family)) - return cssValuePool().createIdentifierValue(familyIdentifier); - return cssValuePool().createValue(family.string(), CSSPrimitiveValue::CSS_STRING); + return CSSValuePool::singleton().createIdentifierValue(familyIdentifier); + return CSSValuePool::singleton().createFontFamilyValue(family); } -static PassRefPtr<CSSValue> renderTextDecorationFlagsToCSSValue(int textDecoration) +static Ref<CSSValue> renderTextDecorationFlagsToCSSValue(int textDecoration) { + auto& cssValuePool = CSSValuePool::singleton(); // Blink value is ignored. RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); if (textDecoration & TextDecorationUnderline) - list->append(cssValuePool().createIdentifierValue(CSSValueUnderline)); + list->append(cssValuePool.createIdentifierValue(CSSValueUnderline)); if (textDecoration & TextDecorationOverline) - list->append(cssValuePool().createIdentifierValue(CSSValueOverline)); + list->append(cssValuePool.createIdentifierValue(CSSValueOverline)); if (textDecoration & TextDecorationLineThrough) - list->append(cssValuePool().createIdentifierValue(CSSValueLineThrough)); + list->append(cssValuePool.createIdentifierValue(CSSValueLineThrough)); +#if ENABLE(LETTERPRESS) + if (textDecoration & TextDecorationLetterpress) + list->append(cssValuePool.createIdentifierValue(CSSValueWebkitLetterpress)); +#endif if (!list->length()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return list.release(); + return cssValuePool.createIdentifierValue(CSSValueNone); + return list.releaseNonNull(); } -#if ENABLE(CSS3_TEXT) -static PassRefPtr<CSSValue> renderTextDecorationStyleFlagsToCSSValue(TextDecorationStyle textDecorationStyle) +static Ref<CSSValue> renderTextDecorationStyleFlagsToCSSValue(TextDecorationStyle textDecorationStyle) { switch (textDecorationStyle) { case TextDecorationStyleSolid: - return cssValuePool().createIdentifierValue(CSSValueSolid); + return CSSValuePool::singleton().createIdentifierValue(CSSValueSolid); case TextDecorationStyleDouble: - return cssValuePool().createIdentifierValue(CSSValueDouble); + return CSSValuePool::singleton().createIdentifierValue(CSSValueDouble); case TextDecorationStyleDotted: - return cssValuePool().createIdentifierValue(CSSValueDotted); + return CSSValuePool::singleton().createIdentifierValue(CSSValueDotted); case TextDecorationStyleDashed: - return cssValuePool().createIdentifierValue(CSSValueDashed); + return CSSValuePool::singleton().createIdentifierValue(CSSValueDashed); case TextDecorationStyleWavy: - return cssValuePool().createIdentifierValue(CSSValueWavy); + return CSSValuePool::singleton().createIdentifierValue(CSSValueWavy); } ASSERT_NOT_REACHED(); - return cssValuePool().createExplicitInitialValue(); + return CSSValuePool::singleton().createExplicitInitialValue(); } -#endif // CSS3_TEXT -static PassRefPtr<CSSValue> fillRepeatToCSSValue(EFillRepeat xRepeat, EFillRepeat yRepeat) +static Ref<CSSValue> renderTextDecorationSkipFlagsToCSSValue(TextDecorationSkip textDecorationSkip) +{ + switch (textDecorationSkip) { + case TextDecorationSkipAuto: + return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto); + case TextDecorationSkipNone: + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); + case TextDecorationSkipInk: + return CSSValuePool::singleton().createIdentifierValue(CSSValueInk); + case TextDecorationSkipObjects: + return CSSValuePool::singleton().createIdentifierValue(CSSValueObjects); + } + + ASSERT_NOT_REACHED(); + return CSSValuePool::singleton().createExplicitInitialValue(); +} + +static Ref<CSSValue> renderEmphasisPositionFlagsToCSSValue(TextEmphasisPosition textEmphasisPosition) +{ + ASSERT(!((textEmphasisPosition & TextEmphasisPositionOver) && (textEmphasisPosition & TextEmphasisPositionUnder))); + ASSERT(!((textEmphasisPosition & TextEmphasisPositionLeft) && (textEmphasisPosition & TextEmphasisPositionRight))); + auto& cssValuePool = CSSValuePool::singleton(); + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); + if (textEmphasisPosition & TextEmphasisPositionOver) + list->append(cssValuePool.createIdentifierValue(CSSValueOver)); + if (textEmphasisPosition & TextEmphasisPositionUnder) + list->append(cssValuePool.createIdentifierValue(CSSValueUnder)); + if (textEmphasisPosition & TextEmphasisPositionLeft) + list->append(cssValuePool.createIdentifierValue(CSSValueLeft)); + if (textEmphasisPosition & TextEmphasisPositionRight) + list->append(cssValuePool.createIdentifierValue(CSSValueRight)); + + if (!list->length()) + return cssValuePool.createIdentifierValue(CSSValueNone); + return list.releaseNonNull(); +} + +static Ref<CSSValue> hangingPunctuationToCSSValue(HangingPunctuation hangingPunctuation) +{ + auto& cssValuePool = CSSValuePool::singleton(); + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); + if (hangingPunctuation & FirstHangingPunctuation) + list->append(cssValuePool.createIdentifierValue(CSSValueFirst)); + if (hangingPunctuation & AllowEndHangingPunctuation) + list->append(cssValuePool.createIdentifierValue(CSSValueAllowEnd)); + if (hangingPunctuation & ForceEndHangingPunctuation) + list->append(cssValuePool.createIdentifierValue(CSSValueForceEnd)); + if (hangingPunctuation & LastHangingPunctuation) + list->append(cssValuePool.createIdentifierValue(CSSValueLast)); + if (!list->length()) + return cssValuePool.createIdentifierValue(CSSValueNone); + return list.releaseNonNull(); +} + +static Ref<CSSValue> fillRepeatToCSSValue(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. + auto& cssValuePool = CSSValuePool::singleton(); if (xRepeat == yRepeat) - return cssValuePool().createValue(xRepeat); + return cssValuePool.createValue(xRepeat); if (xRepeat == RepeatFill && yRepeat == NoRepeatFill) - return cssValuePool().createIdentifierValue(CSSValueRepeatX); + return cssValuePool.createIdentifierValue(CSSValueRepeatX); if (xRepeat == NoRepeatFill && yRepeat == RepeatFill) - return cssValuePool().createIdentifierValue(CSSValueRepeatY); + return cssValuePool.createIdentifierValue(CSSValueRepeatY); - RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - list->append(cssValuePool().createValue(xRepeat)); - list->append(cssValuePool().createValue(yRepeat)); - return list.release(); + auto list = CSSValueList::createSpaceSeparated(); + list.get().append(cssValuePool.createValue(xRepeat)); + list.get().append(cssValuePool.createValue(yRepeat)); + return WTFMove(list); } -static PassRefPtr<CSSValue> fillSizeToCSSValue(const FillSize& fillSize, const RenderStyle* style) +static Ref<CSSValue> fillSourceTypeToCSSValue(EMaskSourceType type) +{ + switch (type) { + case MaskAlpha: + return CSSValuePool::singleton().createValue(CSSValueAlpha); + default: + ASSERT(type == MaskLuminance); + return CSSValuePool::singleton().createValue(CSSValueLuminance); + } +} + +static Ref<CSSValue> fillSizeToCSSValue(const FillSize& fillSize, const RenderStyle& style) { if (fillSize.type == Contain) - return cssValuePool().createIdentifierValue(CSSValueContain); + return CSSValuePool::singleton().createIdentifierValue(CSSValueContain); if (fillSize.type == Cover) - return cssValuePool().createIdentifierValue(CSSValueCover); + return CSSValuePool::singleton().createIdentifierValue(CSSValueCover); if (fillSize.size.height().isAuto()) return zoomAdjustedPixelValueForLength(fillSize.size.width(), style); - RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - list->append(zoomAdjustedPixelValueForLength(fillSize.size.width(), style)); - list->append(zoomAdjustedPixelValueForLength(fillSize.size.height(), style)); - return list.release(); + auto list = CSSValueList::createSpaceSeparated(); + list.get().append(zoomAdjustedPixelValueForLength(fillSize.size.width(), style)); + list.get().append(zoomAdjustedPixelValueForLength(fillSize.size.height(), style)); + return WTFMove(list); } -static PassRefPtr<CSSValue> contentToCSSValue(const RenderStyle* style) +static Ref<CSSValue> altTextToCSSValue(const RenderStyle* style) { - RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); + return CSSValuePool::singleton().createValue(style->contentAltText(), CSSPrimitiveValue::CSS_STRING); +} + +static Ref<CSSValueList> contentToCSSValue(const RenderStyle* style) +{ + auto& cssValuePool = CSSValuePool::singleton(); + auto list = CSSValueList::createSpaceSeparated(); for (const ContentData* contentData = style->contentData(); contentData; contentData = contentData->next()) { - if (contentData->isCounter()) { - const CounterContent* counter = static_cast<const CounterContentData*>(contentData)->counter(); - ASSERT(counter); - list->append(cssValuePool().createValue(counter->identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME)); - } else if (contentData->isImage()) { - const StyleImage* image = static_cast<const ImageContentData*>(contentData)->image(); - ASSERT(image); - list->append(image->cssValue()); - } else if (contentData->isText()) - list->append(cssValuePool().createValue(static_cast<const TextContentData*>(contentData)->text(), CSSPrimitiveValue::CSS_STRING)); - } - if (!style->regionThread().isNull()) - list->append(cssValuePool().createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING)); - return list.release(); + if (is<CounterContentData>(*contentData)) + list.get().append(cssValuePool.createValue(downcast<CounterContentData>(*contentData).counter().identifier(), CSSPrimitiveValue::CSS_COUNTER_NAME)); + else if (is<ImageContentData>(*contentData)) + list.get().append(*downcast<ImageContentData>(*contentData).image().cssValue()); + else if (is<TextContentData>(*contentData)) + list.get().append(cssValuePool.createValue(downcast<TextContentData>(*contentData).text(), CSSPrimitiveValue::CSS_STRING)); + } + if (style->hasFlowFrom()) + list.get().append(cssValuePool.createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING)); + return list; } -static PassRefPtr<CSSValue> counterToCSSValue(const RenderStyle* style, CSSPropertyID propertyID) +static RefPtr<CSSValue> counterToCSSValue(const RenderStyle* style, CSSPropertyID propertyID) { const CounterDirectiveMap* map = style->counterDirectives(); if (!map) - return 0; + return nullptr; + auto& cssValuePool = CSSValuePool::singleton(); RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); for (CounterDirectiveMap::const_iterator it = map->begin(); it != map->end(); ++it) { - list->append(cssValuePool().createValue(it->key, CSSPrimitiveValue::CSS_STRING)); + list->append(cssValuePool.createValue(it->key, CSSPrimitiveValue::CSS_STRING)); short number = propertyID == CSSPropertyCounterIncrement ? it->value.incrementValue() : it->value.resetValue(); - list->append(cssValuePool().createValue((double)number, CSSPrimitiveValue::CSS_NUMBER)); + list->append(cssValuePool.createValue((double)number, CSSPrimitiveValue::CSS_NUMBER)); } return list.release(); } static void logUnimplementedPropertyID(CSSPropertyID propertyID) { - DEFINE_STATIC_LOCAL(HashSet<CSSPropertyID>, propertyIDSet, ()); - if (!propertyIDSet.add(propertyID).isNewEntry) + static NeverDestroyed<HashSet<CSSPropertyID>> propertyIDSet; + if (!propertyIDSet.get().add(propertyID).isNewEntry) return; LOG_ERROR("WebKit does not yet implement getComputedStyle for '%s'.", getPropertyName(propertyID)); } -static PassRefPtr<CSSValueList> fontFamilyFromStyle(RenderStyle* style) - { - RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); - for (unsigned i = 0; i < style->font().familyCount(); ++i) - list->append(valueForFamily(style->font().familyAt(i))); - return list.release(); +static Ref<CSSValueList> fontFamilyFromStyle(RenderStyle* style) +{ + auto list = CSSValueList::createCommaSeparated(); + for (unsigned i = 0; i < style->fontCascade().familyCount(); ++i) + list.get().append(valueForFamily(style->fontCascade().familyAt(i))); + return list; } -static PassRefPtr<CSSPrimitiveValue> lineHeightFromStyle(RenderStyle* style, RenderView* renderView) +static Ref<CSSPrimitiveValue> lineHeightFromStyle(RenderStyle& style) { - Length length = style->lineHeight(); - if (length.isNegative()) - return cssValuePool().createIdentifierValue(CSSValueNormal); - if (length.isPercent()) + Length length = style.lineHeight(); + if (length.isNegative()) // If true, line-height not set; use the font's line spacing. + return zoomAdjustedPixelValue(style.fontMetrics().floatLineSpacing(), style); + if (length.isPercent()) { // This is imperfect, because it doesn't include the zoom factor and the real computation // for how high to be in pixels does include things like minimum font size and the zoom factor. // On the other hand, since font-size doesn't include the zoom factor, we really can't do // that here either. - return zoomAdjustedPixelValue(static_cast<int>(length.percent() * style->fontDescription().specifiedSize()) / 100, style); - return zoomAdjustedPixelValue(valueForLength(length, 0, renderView), style); + return zoomAdjustedPixelValue(static_cast<int>(length.percent() * style.fontDescription().specifiedSize()) / 100, style); + } + return zoomAdjustedPixelValue(floatValueForLength(length, 0), style); } -static PassRefPtr<CSSPrimitiveValue> fontSizeFromStyle(RenderStyle* style) +static Ref<CSSPrimitiveValue> fontSizeFromStyle(RenderStyle& style) { - return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), style); + return zoomAdjustedPixelValue(style.fontDescription().computedSize(), style); } -static PassRefPtr<CSSPrimitiveValue> fontStyleFromStyle(RenderStyle* style) +static Ref<CSSPrimitiveValue> fontStyleFromStyle(RenderStyle* style) { if (style->fontDescription().italic()) - return cssValuePool().createIdentifierValue(CSSValueItalic); - return cssValuePool().createIdentifierValue(CSSValueNormal); + return CSSValuePool::singleton().createIdentifierValue(CSSValueItalic); + return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal); } -static PassRefPtr<CSSPrimitiveValue> fontVariantFromStyle(RenderStyle* style) +static Ref<CSSValue> fontVariantFromStyle(RenderStyle* style) { - if (style->fontDescription().smallCaps()) - return cssValuePool().createIdentifierValue(CSSValueSmallCaps); - return cssValuePool().createIdentifierValue(CSSValueNormal); + if (style->fontDescription().variantSettings().isAllNormal()) + return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal); + + auto list = CSSValueList::createSpaceSeparated(); + + switch (style->fontDescription().variantCommonLigatures()) { + case FontVariantLigatures::Normal: + break; + case FontVariantLigatures::Yes: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueCommonLigatures)); + break; + case FontVariantLigatures::No: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueNoCommonLigatures)); + break; + } + + switch (style->fontDescription().variantDiscretionaryLigatures()) { + case FontVariantLigatures::Normal: + break; + case FontVariantLigatures::Yes: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueDiscretionaryLigatures)); + break; + case FontVariantLigatures::No: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueNoDiscretionaryLigatures)); + break; + } + + switch (style->fontDescription().variantHistoricalLigatures()) { + case FontVariantLigatures::Normal: + break; + case FontVariantLigatures::Yes: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueHistoricalLigatures)); + break; + case FontVariantLigatures::No: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueNoHistoricalLigatures)); + break; + } + + switch (style->fontDescription().variantContextualAlternates()) { + case FontVariantLigatures::Normal: + break; + case FontVariantLigatures::Yes: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueContextual)); + break; + case FontVariantLigatures::No: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueNoContextual)); + break; + } + + switch (style->fontDescription().variantPosition()) { + case FontVariantPosition::Normal: + break; + case FontVariantPosition::Subscript: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueSub)); + break; + case FontVariantPosition::Superscript: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueSuper)); + break; + } + + switch (style->fontDescription().variantCaps()) { + case FontVariantCaps::Normal: + break; + case FontVariantCaps::Small: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueSmallCaps)); + break; + case FontVariantCaps::AllSmall: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueAllSmallCaps)); + break; + case FontVariantCaps::Petite: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValuePetiteCaps)); + break; + case FontVariantCaps::AllPetite: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueAllPetiteCaps)); + break; + case FontVariantCaps::Unicase: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueUnicase)); + break; + case FontVariantCaps::Titling: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueTitlingCaps)); + break; + } + + switch (style->fontDescription().variantNumericFigure()) { + case FontVariantNumericFigure::Normal: + break; + case FontVariantNumericFigure::LiningNumbers: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueLiningNums)); + break; + case FontVariantNumericFigure::OldStyleNumbers: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueOldstyleNums)); + break; + } + + switch (style->fontDescription().variantNumericSpacing()) { + case FontVariantNumericSpacing::Normal: + break; + case FontVariantNumericSpacing::ProportionalNumbers: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueProportionalNums)); + break; + case FontVariantNumericSpacing::TabularNumbers: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueTabularNums)); + break; + } + + switch (style->fontDescription().variantNumericFraction()) { + case FontVariantNumericFraction::Normal: + break; + case FontVariantNumericFraction::DiagonalFractions: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueDiagonalFractions)); + break; + case FontVariantNumericFraction::StackedFractions: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueStackedFractions)); + break; + } + + switch (style->fontDescription().variantNumericOrdinal()) { + case FontVariantNumericOrdinal::Normal: + break; + case FontVariantNumericOrdinal::Yes: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueOrdinal)); + break; + } + + switch (style->fontDescription().variantNumericSlashedZero()) { + case FontVariantNumericSlashedZero::Normal: + break; + case FontVariantNumericSlashedZero::Yes: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueSlashedZero)); + break; + } + + switch (style->fontDescription().variantAlternates()) { + case FontVariantAlternates::Normal: + break; + case FontVariantAlternates::HistoricalForms: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueHistoricalForms)); + break; + } + + switch (style->fontDescription().variantEastAsianVariant()) { + case FontVariantEastAsianVariant::Normal: + break; + case FontVariantEastAsianVariant::Jis78: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis78)); + break; + case FontVariantEastAsianVariant::Jis83: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis83)); + break; + case FontVariantEastAsianVariant::Jis90: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis90)); + break; + case FontVariantEastAsianVariant::Jis04: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis04)); + break; + case FontVariantEastAsianVariant::Simplified: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueSimplified)); + break; + case FontVariantEastAsianVariant::Traditional: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueTraditional)); + break; + } + + switch (style->fontDescription().variantEastAsianWidth()) { + case FontVariantEastAsianWidth::Normal: + break; + case FontVariantEastAsianWidth::Full: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueFullWidth)); + break; + case FontVariantEastAsianWidth::Proportional: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueProportionalWidth)); + break; + } + + switch (style->fontDescription().variantEastAsianRuby()) { + case FontVariantEastAsianRuby::Normal: + break; + case FontVariantEastAsianRuby::Yes: + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueRuby)); + break; + } + + return WTFMove(list); } -static PassRefPtr<CSSPrimitiveValue> fontWeightFromStyle(RenderStyle* style) +static Ref<CSSPrimitiveValue> fontWeightFromStyle(RenderStyle* style) { switch (style->fontDescription().weight()) { case FontWeight100: - return cssValuePool().createIdentifierValue(CSSValue100); + return CSSValuePool::singleton().createIdentifierValue(CSSValue100); case FontWeight200: - return cssValuePool().createIdentifierValue(CSSValue200); + return CSSValuePool::singleton().createIdentifierValue(CSSValue200); case FontWeight300: - return cssValuePool().createIdentifierValue(CSSValue300); + return CSSValuePool::singleton().createIdentifierValue(CSSValue300); case FontWeightNormal: - return cssValuePool().createIdentifierValue(CSSValueNormal); + return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal); case FontWeight500: - return cssValuePool().createIdentifierValue(CSSValue500); + return CSSValuePool::singleton().createIdentifierValue(CSSValue500); case FontWeight600: - return cssValuePool().createIdentifierValue(CSSValue600); + return CSSValuePool::singleton().createIdentifierValue(CSSValue600); case FontWeightBold: - return cssValuePool().createIdentifierValue(CSSValueBold); + return CSSValuePool::singleton().createIdentifierValue(CSSValueBold); case FontWeight800: - return cssValuePool().createIdentifierValue(CSSValue800); + return CSSValuePool::singleton().createIdentifierValue(CSSValue800); case FontWeight900: - return cssValuePool().createIdentifierValue(CSSValue900); + return CSSValuePool::singleton().createIdentifierValue(CSSValue900); } ASSERT_NOT_REACHED(); - return cssValuePool().createIdentifierValue(CSSValueNormal); + return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal); } -typedef Length (RenderStyle::*RenderStyleLengthGetter)() const; +static Ref<CSSValue> fontSynthesisFromStyle(RenderStyle& style) +{ + if (style.fontDescription().fontSynthesis() == FontSynthesisNone) + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); + + auto list = CSSValueList::createSpaceSeparated(); + if (style.fontDescription().fontSynthesis() & FontSynthesisStyle) + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueStyle)); + if (style.fontDescription().fontSynthesis() & FontSynthesisWeight) + list.get().append(CSSValuePool::singleton().createIdentifierValue(CSSValueWeight)); + return Ref<CSSValue>(list.get()); +} + +typedef const Length& (RenderStyle::*RenderStyleLengthGetter)() const; typedef LayoutUnit (RenderBoxModelObject::*RenderBoxComputedCSSValueGetter)() const; template<RenderStyleLengthGetter lengthGetter, RenderBoxComputedCSSValueGetter computedCSSValueGetter> -inline PassRefPtr<CSSValue> zoomAdjustedPaddingOrMarginPixelValue(RenderStyle* style, RenderObject* renderer) +inline RefPtr<CSSValue> zoomAdjustedPaddingOrMarginPixelValue(RenderStyle& style, RenderObject* renderer) { - Length unzoomzedLength = (style->*lengthGetter)(); - if (!renderer || !renderer->isBox() || unzoomzedLength.isFixed()) + Length unzoomzedLength = (style.*lengthGetter)(); + if (!is<RenderBox>(renderer) || unzoomzedLength.isFixed()) return zoomAdjustedPixelValueForLength(unzoomzedLength, style); - return zoomAdjustedPixelValue((toRenderBox(renderer)->*computedCSSValueGetter)(), style); + return zoomAdjustedPixelValue((downcast<RenderBox>(*renderer).*computedCSSValueGetter)(), style); } template<RenderStyleLengthGetter lengthGetter> @@ -1540,16 +2086,68 @@ inline bool paddingOrMarginIsRendererDependent(RenderStyle* style, RenderObject* return !(style && (style->*lengthGetter)().isFixed()); } +static CSSValueID convertToPageBreak(BreakBetween value) +{ + if (value == PageBreakBetween || value == LeftPageBreakBetween || value == RightPageBreakBetween + || value == RectoPageBreakBetween || value == VersoPageBreakBetween) + return CSSValueAlways; // CSS 2.1 allows us to map these to always. + if (value == AvoidBreakBetween || value == AvoidPageBreakBetween) + return CSSValueAvoid; + return CSSValueAuto; +} + +static CSSValueID convertToColumnBreak(BreakBetween value) +{ + if (value == ColumnBreakBetween) + return CSSValueAlways; + if (value == AvoidBreakBetween || value == AvoidColumnBreakBetween) + return CSSValueAvoid; + return CSSValueAuto; +} + +static CSSValueID convertToPageBreak(BreakInside value) +{ + if (value == AvoidBreakInside || value == AvoidPageBreakInside) + return CSSValueAvoid; + return CSSValueAuto; +} + +static CSSValueID convertToColumnBreak(BreakInside value) +{ + if (value == AvoidBreakInside || value == AvoidColumnBreakInside) + return CSSValueAvoid; + return CSSValueAuto; +} + +#if ENABLE(CSS_REGIONS) +static CSSValueID convertToRegionBreak(BreakBetween value) +{ + if (value == RegionBreakBetween) + return CSSValueAlways; + if (value == AvoidBreakBetween || value == AvoidRegionBreakBetween) + return CSSValueAvoid; + return CSSValueAuto; +} + +static CSSValueID convertToRegionBreak(BreakInside value) +{ + if (value == AvoidBreakInside || value == AvoidRegionBreakInside) + return CSSValueAvoid; + return CSSValueAuto; +} +#endif + static bool isLayoutDependent(CSSPropertyID propertyID, RenderStyle* style, RenderObject* renderer) { switch (propertyID) { case CSSPropertyWidth: case CSSPropertyHeight: - case CSSPropertyWebkitPerspectiveOrigin: - case CSSPropertyWebkitTransformOrigin: - case CSSPropertyWebkitTransform: -#if ENABLE(CSS_FILTERS) - case CSSPropertyWebkitFilter: + case CSSPropertyPerspectiveOrigin: + case CSSPropertyTransformOrigin: + case CSSPropertyTransform: + case CSSPropertyFilter: +#if ENABLE(FILTERS_LEVEL_2) + case CSSPropertyWebkitBackdropFilter: #endif return true; case CSSPropertyMargin: { @@ -1580,6 +2178,13 @@ static bool isLayoutDependent(CSSPropertyID propertyID, RenderStyle* style, Rend return paddingOrMarginIsRendererDependent<&RenderStyle::paddingBottom>(style, renderer); case CSSPropertyPaddingLeft: return paddingOrMarginIsRendererDependent<&RenderStyle::paddingLeft>(style, renderer); +#if ENABLE(CSS_GRID_LAYOUT) + case CSSPropertyWebkitGridTemplateColumns: + case CSSPropertyWebkitGridTemplateRows: + case CSSPropertyWebkitGridTemplate: + case CSSPropertyWebkitGrid: + return renderer && renderer->isRenderGrid(); +#endif default: return false; } @@ -1588,82 +2193,221 @@ static bool isLayoutDependent(CSSPropertyID propertyID, RenderStyle* style, Rend Node* ComputedStyleExtractor::styledNode() const { if (!m_node) - return 0; - if (m_node->isElementNode()) { - if (PseudoElement* element = toElement(m_node.get())->pseudoElement(m_pseudoElementSpecifier)) - return element; - } - return m_node.get(); + return nullptr; + if (!is<Element>(*m_node)) + return m_node.get(); + Element& element = downcast<Element>(*m_node); + PseudoElement* pseudoElement; + if (m_pseudoElementSpecifier == BEFORE && (pseudoElement = element.beforePseudoElement())) + return pseudoElement; + if (m_pseudoElementSpecifier == AFTER && (pseudoElement = element.afterPseudoElement())) + return pseudoElement; + return &element; } -PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID, EUpdateLayout updateLayout) const +static ItemPosition resolveContainerAlignmentAuto(ItemPosition position, RenderObject* element) +{ + if (position != ItemPositionAuto || !element) + return position; + + return element->style().isDisplayFlexibleOrGridBox() ? ItemPositionStretch : ItemPositionStart; +} + +static ItemPosition resolveSelfAlignmentAuto(ItemPosition position, OverflowAlignment& overflow, RenderObject* element) +{ + if (position != ItemPositionAuto || !element || element->isOutOfFlowPositioned()) + return position; + + RenderBlock* parent = element->containingBlock(); + if (!parent) + return ItemPositionStart; + + overflow = parent->style().alignItemsOverflowAlignment(); + return resolveContainerAlignmentAuto(parent->style().alignItemsPosition(), parent); +} + +static void resolveContentAlignmentAuto(ContentPosition& position, ContentDistributionType& distribution, RenderObject* element) +{ + if (position != ContentPositionAuto || distribution != ContentDistributionDefault || !element) + return; + + // Even that both align-content and justify-content 'auto' values are resolved to 'stretch' + // in case of flexbox containers, 'stretch' value in justify-content will behave like 'flex-start'. + if (element->style().isDisplayFlexibleBox()) + distribution = ContentDistributionStretch; + else + position = ContentPositionStart; +} + +RefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID, EUpdateLayout updateLayout) const { return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).propertyValue(propertyID, updateLayout); } -PassRefPtr<MutableStylePropertySet> CSSComputedStyleDeclaration::copyProperties() const +Ref<MutableStyleProperties> CSSComputedStyleDeclaration::copyProperties() const { return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).copyProperties(); } -static inline bool nodeOrItsAncestorNeedsStyleRecalc(Node* styledNode) +static inline bool nodeOrItsAncestorNeedsStyleRecalc(const Node& node) { - if (styledNode->document()->hasPendingForcedStyleRecalc()) + if (node.needsStyleRecalc()) return true; - for (Node* n = styledNode; n; n = n->parentNode()) {// FIXME: Call parentOrShadowHostNode() instead - if (n->needsStyleRecalc()) + + const Node* currentNode = &node; + const Element* ancestor = currentNode->parentOrShadowHostElement(); + while (ancestor) { + if (ancestor->needsStyleRecalc()) + return true; + + if (ancestor->directChildNeedsStyleRecalc() && currentNode->styleIsAffectedByPreviousSibling()) return true; + + currentNode = ancestor; + ancestor = currentNode->parentOrShadowHostElement(); } return false; } -static inline PassRefPtr<RenderStyle> computeRenderStyleForProperty(Node* styledNode, PseudoId pseudoElementSpecifier, CSSPropertyID propertyID) +static inline bool updateStyleIfNeededForNode(const Node& node) +{ + Document& document = node.document(); + if (!document.hasPendingForcedStyleRecalc() && !(document.childNeedsStyleRecalc() && nodeOrItsAncestorNeedsStyleRecalc(node))) + return false; + document.updateStyleIfNeeded(); + return true; +} + +static inline RefPtr<RenderStyle> computeRenderStyleForProperty(Node* styledNode, PseudoId pseudoElementSpecifier, CSSPropertyID propertyID) { RenderObject* renderer = styledNode->renderer(); if (renderer && renderer->isComposited() && AnimationController::supportsAcceleratedAnimationOfProperty(propertyID)) { - AnimationUpdateBlock animationUpdateBlock(renderer->animation()); - RefPtr<RenderStyle> style = renderer->animation()->getAnimatedStyleForRenderer(renderer); + RefPtr<RenderStyle> style = renderer->animation().getAnimatedStyleForRenderer(downcast<RenderElement>(*renderer)); if (pseudoElementSpecifier && !styledNode->isPseudoElement()) { // FIXME: This cached pseudo style will only exist if the animation has been run at least once. return style->getCachedPseudoStyle(pseudoElementSpecifier); } - return style.release(); + return style; } return styledNode->computedStyle(styledNode->isPseudoElement() ? NOPSEUDO : pseudoElementSpecifier); } -PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propertyID, EUpdateLayout updateLayout) const +#if ENABLE(CSS_SHAPES) +static Ref<CSSValue> shapePropertyValue(const RenderStyle& style, const ShapeValue* shapeValue) +{ + if (!shapeValue) + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); + + if (shapeValue->type() == ShapeValue::Type::Box) + return CSSValuePool::singleton().createValue(shapeValue->cssBox()); + + if (shapeValue->type() == ShapeValue::Type::Image) { + if (shapeValue->image()) + return *shapeValue->image()->cssValue(); + return CSSValuePool::singleton().createIdentifierValue(CSSValueNone); + } + + ASSERT(shapeValue->type() == ShapeValue::Type::Shape); + + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); + list->append(valueForBasicShape(style, *shapeValue->shape())); + if (shapeValue->cssBox() != BoxMissing) + list->append(CSSValuePool::singleton().createValue(shapeValue->cssBox())); + return list.releaseNonNull(); +} +#endif + +static RefPtr<CSSValueList> valueForItemPositionWithOverflowAlignment(ItemPosition itemPosition, OverflowAlignment overflowAlignment, ItemPositionType positionType) +{ + auto& cssValuePool = CSSValuePool::singleton(); + RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated(); + if (positionType == LegacyPosition) + result->append(CSSPrimitiveValue::createIdentifier(CSSValueLegacy)); + result->append(cssValuePool.createValue(itemPosition)); + if (overflowAlignment != OverflowAlignmentDefault) + result->append(cssValuePool.createValue(overflowAlignment)); + ASSERT(result->length() <= 2); + return result; +} + +static RefPtr<CSSValueList> valueForContentPositionAndDistributionWithOverflowAlignment(ContentPosition position, ContentDistributionType distribution, OverflowAlignment overflowAlignment) +{ + RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated(); + if (distribution != ContentDistributionDefault) + result->append(CSSPrimitiveValue::create(distribution)); + if (distribution == ContentDistributionDefault || position != ContentPositionAuto) + result->append(CSSPrimitiveValue::create(position)); + if ((position >= ContentPositionCenter || distribution != ContentDistributionDefault) && overflowAlignment != OverflowAlignmentDefault) + result->append(CSSPrimitiveValue::create(overflowAlignment)); + ASSERT(result->length() > 0); + ASSERT(result->length() <= 3); + return result; +} + +inline static bool isFlexOrGrid(ContainerNode* element) +{ + return element && element->computedStyle() && element->computedStyle()->isDisplayFlexibleOrGridBox(); +} + +RefPtr<CSSValue> ComputedStyleExtractor::customPropertyValue(const String& propertyName) const { Node* styledNode = this->styledNode(); if (!styledNode) - return 0; + return nullptr; + + if (updateStyleIfNeededForNode(*styledNode)) { + // The style recalc could have caused the styled node to be discarded or replaced + // if it was a PseudoElement so we need to update it. + styledNode = this->styledNode(); + } + + RefPtr<RenderStyle> style = computeRenderStyleForProperty(styledNode, m_pseudoElementSpecifier, CSSPropertyCustom); + if (!style || !style->hasCustomProperty(propertyName)) + return nullptr; + + return style->getCustomPropertyValue(propertyName); +} + +String ComputedStyleExtractor::customPropertyText(const String& propertyName) const +{ + RefPtr<CSSValue> propertyValue = this->customPropertyValue(propertyName); + return propertyValue ? propertyValue->cssText() : emptyString(); +} + +RefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propertyID, EUpdateLayout updateLayout) const +{ + Node* styledNode = this->styledNode(); + if (!styledNode) + return nullptr; RefPtr<RenderStyle> style; - RenderObject* renderer; + RenderObject* renderer = nullptr; bool forceFullLayout = false; if (updateLayout) { - Document* document = styledNode->document(); + Document& document = styledNode->document(); - if (nodeOrItsAncestorNeedsStyleRecalc(styledNode)) { - document->updateStyleIfNeeded(); + if (updateStyleIfNeededForNode(*styledNode)) { // The style recalc could have caused the styled node to be discarded or replaced // if it was a PseudoElement so we need to update it. styledNode = this->styledNode(); } - style = computeRenderStyleForProperty(styledNode, m_pseudoElementSpecifier, propertyID); renderer = styledNode->renderer(); + if (propertyID == CSSPropertyDisplay && !renderer && is<SVGElement>(*styledNode) && !downcast<SVGElement>(*styledNode).isValid()) + return nullptr; + + style = computeRenderStyleForProperty(styledNode, m_pseudoElementSpecifier, propertyID); + // FIXME: Some of these cases could be narrowed down or optimized better. forceFullLayout = isLayoutDependent(propertyID, style.get(), renderer) || styledNode->isInShadowTree() - || (document->styleResolverIfExists() && document->styleResolverIfExists()->hasViewportDependentMediaQueries() && document->ownerElement()) - || document->seamlessParentIFrame(); + || (document.styleResolverIfExists() && document.styleResolverIfExists()->hasViewportDependentMediaQueries() && document.ownerElement()); if (forceFullLayout) { - document->updateLayoutIgnorePendingStylesheets(); + document.updateLayoutIgnorePendingStylesheets(); styledNode = this->styledNode(); } } @@ -1674,53 +2418,51 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert } if (!style) - return 0; + return nullptr; + auto& cssValuePool = CSSValuePool::singleton(); propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction(), style->writingMode()); switch (propertyID) { case CSSPropertyInvalid: -#if ENABLE(CSS_VARIABLES) - case CSSPropertyVariable: -#endif break; case CSSPropertyBackgroundColor: - return cssValuePool().createColorValue(m_allowVisitedStyle? style->visitedDependentColor(CSSPropertyBackgroundColor).rgb() : style->backgroundColor().rgb()); + return cssValuePool.createColorValue(m_allowVisitedStyle? style->visitedDependentColor(CSSPropertyBackgroundColor).rgb() : style->backgroundColor().rgb()); case CSSPropertyBackgroundImage: case CSSPropertyWebkitMaskImage: { const FillLayer* layers = propertyID == CSSPropertyWebkitMaskImage ? style->maskLayers() : style->backgroundLayers(); if (!layers) - return cssValuePool().createIdentifierValue(CSSValueNone); + return cssValuePool.createIdentifierValue(CSSValueNone); if (!layers->next()) { if (layers->image()) return layers->image()->cssValue(); - return cssValuePool().createIdentifierValue(CSSValueNone); + return cssValuePool.createIdentifierValue(CSSValueNone); } RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) { if (currLayer->image()) - list->append(currLayer->image()->cssValue()); + list->append(*currLayer->image()->cssValue()); else - list->append(cssValuePool().createIdentifierValue(CSSValueNone)); + list->append(cssValuePool.createIdentifierValue(CSSValueNone)); } - return list.release(); + return list; } case CSSPropertyBackgroundSize: case CSSPropertyWebkitBackgroundSize: case CSSPropertyWebkitMaskSize: { const FillLayer* layers = propertyID == CSSPropertyWebkitMaskSize ? style->maskLayers() : style->backgroundLayers(); if (!layers->next()) - return fillSizeToCSSValue(layers->size(), style.get()); + return fillSizeToCSSValue(layers->size(), *style); RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) - list->append(fillSizeToCSSValue(currLayer->size(), style.get())); + list->append(fillSizeToCSSValue(currLayer->size(), *style)); - return list.release(); + return list; } case CSSPropertyBackgroundRepeat: case CSSPropertyWebkitMaskRepeat: { @@ -1732,30 +2474,45 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) list->append(fillRepeatToCSSValue(currLayer->repeatX(), currLayer->repeatY())); - return list.release(); + return list; + } + case CSSPropertyWebkitMaskSourceType: { + const FillLayer* layers = style->maskLayers(); + + if (!layers) + return cssValuePool.createIdentifierValue(CSSValueNone); + + if (!layers->next()) + return fillSourceTypeToCSSValue(layers->maskSourceType()); + + RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); + for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) + list->append(fillSourceTypeToCSSValue(currLayer->maskSourceType())); + + return list; } case CSSPropertyWebkitBackgroundComposite: case CSSPropertyWebkitMaskComposite: { const FillLayer* layers = propertyID == CSSPropertyWebkitMaskComposite ? style->maskLayers() : style->backgroundLayers(); if (!layers->next()) - return cssValuePool().createValue(layers->composite()); + return cssValuePool.createValue(layers->composite()); RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) - list->append(cssValuePool().createValue(currLayer->composite())); + list->append(cssValuePool.createValue(currLayer->composite())); - return list.release(); + return list; } case CSSPropertyBackgroundAttachment: { const FillLayer* layers = style->backgroundLayers(); if (!layers->next()) - return cssValuePool().createValue(layers->attachment()); + return cssValuePool.createValue(layers->attachment()); RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) - list->append(cssValuePool().createValue(currLayer->attachment())); + list->append(cssValuePool.createValue(currLayer->attachment())); - return list.release(); + return list; } case CSSPropertyBackgroundClip: case CSSPropertyBackgroundOrigin: @@ -1767,170 +2524,172 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert bool isClip = propertyID == CSSPropertyBackgroundClip || propertyID == CSSPropertyWebkitBackgroundClip || propertyID == CSSPropertyWebkitMaskClip; if (!layers->next()) { EFillBox box = isClip ? layers->clip() : layers->origin(); - return cssValuePool().createValue(box); + return cssValuePool.createValue(box); } RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) { EFillBox box = isClip ? currLayer->clip() : currLayer->origin(); - list->append(cssValuePool().createValue(box)); + list->append(cssValuePool.createValue(box)); } - return list.release(); + return list; } case CSSPropertyBackgroundPosition: case CSSPropertyWebkitMaskPosition: { const FillLayer* layers = propertyID == CSSPropertyWebkitMaskPosition ? style->maskLayers() : style->backgroundLayers(); if (!layers->next()) - return createPositionListForLayer(propertyID, layers, style.get()); + return createPositionListForLayer(propertyID, layers, *style); RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) - list->append(createPositionListForLayer(propertyID, currLayer, style.get())); - return list.release(); + list->append(createPositionListForLayer(propertyID, currLayer, *style)); + return list; } case CSSPropertyBackgroundPositionX: case CSSPropertyWebkitMaskPositionX: { const FillLayer* layers = propertyID == CSSPropertyWebkitMaskPositionX ? style->maskLayers() : style->backgroundLayers(); if (!layers->next()) - return cssValuePool().createValue(layers->xPosition()); + return cssValuePool.createValue(layers->xPosition()); RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) - list->append(cssValuePool().createValue(currLayer->xPosition())); + list->append(cssValuePool.createValue(currLayer->xPosition())); - return list.release(); + return list; } case CSSPropertyBackgroundPositionY: case CSSPropertyWebkitMaskPositionY: { const FillLayer* layers = propertyID == CSSPropertyWebkitMaskPositionY ? style->maskLayers() : style->backgroundLayers(); if (!layers->next()) - return cssValuePool().createValue(layers->yPosition()); + return cssValuePool.createValue(layers->yPosition()); RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) - list->append(cssValuePool().createValue(currLayer->yPosition())); + list->append(cssValuePool.createValue(currLayer->yPosition())); - return list.release(); + return list; } case CSSPropertyBorderCollapse: if (style->borderCollapse()) - return cssValuePool().createIdentifierValue(CSSValueCollapse); - return cssValuePool().createIdentifierValue(CSSValueSeparate); + return cssValuePool.createIdentifierValue(CSSValueCollapse); + return cssValuePool.createIdentifierValue(CSSValueSeparate); case CSSPropertyBorderSpacing: { RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - list->append(zoomAdjustedPixelValue(style->horizontalBorderSpacing(), style.get())); - list->append(zoomAdjustedPixelValue(style->verticalBorderSpacing(), style.get())); - return list.release(); + list->append(zoomAdjustedPixelValue(style->horizontalBorderSpacing(), *style)); + list->append(zoomAdjustedPixelValue(style->verticalBorderSpacing(), *style)); + return list; } case CSSPropertyWebkitBorderHorizontalSpacing: - return zoomAdjustedPixelValue(style->horizontalBorderSpacing(), style.get()); + return zoomAdjustedPixelValue(style->horizontalBorderSpacing(), *style); case CSSPropertyWebkitBorderVerticalSpacing: - return zoomAdjustedPixelValue(style->verticalBorderSpacing(), style.get()); + return zoomAdjustedPixelValue(style->verticalBorderSpacing(), *style); case CSSPropertyBorderImageSource: if (style->borderImageSource()) return style->borderImageSource()->cssValue(); - return cssValuePool().createIdentifierValue(CSSValueNone); + return cssValuePool.createIdentifierValue(CSSValueNone); case CSSPropertyBorderTopColor: - return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyBorderTopColor).rgb()) : currentColorOrValidColor(style.get(), style->borderTopColor()); + return m_allowVisitedStyle ? cssValuePool.createColorValue(style->visitedDependentColor(CSSPropertyBorderTopColor).rgb()) : currentColorOrValidColor(style.get(), style->borderTopColor()); case CSSPropertyBorderRightColor: - return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyBorderRightColor).rgb()) : currentColorOrValidColor(style.get(), style->borderRightColor()); + return m_allowVisitedStyle ? cssValuePool.createColorValue(style->visitedDependentColor(CSSPropertyBorderRightColor).rgb()) : currentColorOrValidColor(style.get(), style->borderRightColor()); case CSSPropertyBorderBottomColor: - return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyBorderBottomColor).rgb()) : currentColorOrValidColor(style.get(), style->borderBottomColor()); + return m_allowVisitedStyle ? cssValuePool.createColorValue(style->visitedDependentColor(CSSPropertyBorderBottomColor).rgb()) : currentColorOrValidColor(style.get(), style->borderBottomColor()); case CSSPropertyBorderLeftColor: - return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyBorderLeftColor).rgb()) : currentColorOrValidColor(style.get(), style->borderLeftColor()); + return m_allowVisitedStyle ? cssValuePool.createColorValue(style->visitedDependentColor(CSSPropertyBorderLeftColor).rgb()) : currentColorOrValidColor(style.get(), style->borderLeftColor()); case CSSPropertyBorderTopStyle: - return cssValuePool().createValue(style->borderTopStyle()); + return cssValuePool.createValue(style->borderTopStyle()); case CSSPropertyBorderRightStyle: - return cssValuePool().createValue(style->borderRightStyle()); + return cssValuePool.createValue(style->borderRightStyle()); case CSSPropertyBorderBottomStyle: - return cssValuePool().createValue(style->borderBottomStyle()); + return cssValuePool.createValue(style->borderBottomStyle()); case CSSPropertyBorderLeftStyle: - return cssValuePool().createValue(style->borderLeftStyle()); + return cssValuePool.createValue(style->borderLeftStyle()); case CSSPropertyBorderTopWidth: - return zoomAdjustedPixelValue(style->borderTopWidth(), style.get()); + return zoomAdjustedPixelValue(style->borderTopWidth(), *style); case CSSPropertyBorderRightWidth: - return zoomAdjustedPixelValue(style->borderRightWidth(), style.get()); + return zoomAdjustedPixelValue(style->borderRightWidth(), *style); case CSSPropertyBorderBottomWidth: - return zoomAdjustedPixelValue(style->borderBottomWidth(), style.get()); + return zoomAdjustedPixelValue(style->borderBottomWidth(), *style); case CSSPropertyBorderLeftWidth: - return zoomAdjustedPixelValue(style->borderLeftWidth(), style.get()); + return zoomAdjustedPixelValue(style->borderLeftWidth(), *style); case CSSPropertyBottom: - return getPositionOffsetValue(style.get(), CSSPropertyBottom, m_node->document()->renderView()); + return positionOffsetValue(*style, CSSPropertyBottom); case CSSPropertyWebkitBoxAlign: - return cssValuePool().createValue(style->boxAlign()); + return cssValuePool.createValue(style->boxAlign()); #if ENABLE(CSS_BOX_DECORATION_BREAK) case CSSPropertyWebkitBoxDecorationBreak: if (style->boxDecorationBreak() == DSLICE) - return cssValuePool().createIdentifierValue(CSSValueSlice); - return cssValuePool().createIdentifierValue(CSSValueClone); + return cssValuePool.createIdentifierValue(CSSValueSlice); + return cssValuePool.createIdentifierValue(CSSValueClone); #endif case CSSPropertyWebkitBoxDirection: - return cssValuePool().createValue(style->boxDirection()); + return cssValuePool.createValue(style->boxDirection()); case CSSPropertyWebkitBoxFlex: - return cssValuePool().createValue(style->boxFlex(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createValue(style->boxFlex(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyWebkitBoxFlexGroup: - return cssValuePool().createValue(style->boxFlexGroup(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createValue(style->boxFlexGroup(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyWebkitBoxLines: - return cssValuePool().createValue(style->boxLines()); + return cssValuePool.createValue(style->boxLines()); case CSSPropertyWebkitBoxOrdinalGroup: - return cssValuePool().createValue(style->boxOrdinalGroup(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createValue(style->boxOrdinalGroup(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyWebkitBoxOrient: - return cssValuePool().createValue(style->boxOrient()); + return cssValuePool.createValue(style->boxOrient()); case CSSPropertyWebkitBoxPack: - return cssValuePool().createValue(style->boxPack()); + return cssValuePool.createValue(style->boxPack()); case CSSPropertyWebkitBoxReflect: - return valueForReflection(style->boxReflect(), style.get()); + return valueForReflection(style->boxReflect(), *style); case CSSPropertyBoxShadow: case CSSPropertyWebkitBoxShadow: - return valueForShadow(style->boxShadow(), propertyID, style.get()); + return valueForShadow(style->boxShadow(), propertyID, *style); case CSSPropertyCaptionSide: - return cssValuePool().createValue(style->captionSide()); + return cssValuePool.createValue(style->captionSide()); case CSSPropertyClear: - return cssValuePool().createValue(style->clear()); + return cssValuePool.createValue(style->clear()); case CSSPropertyColor: - return cssValuePool().createColorValue(m_allowVisitedStyle ? style->visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb()); + return cssValuePool.createColorValue(m_allowVisitedStyle ? style->visitedDependentColor(CSSPropertyColor).rgb() : style->color().rgb()); case CSSPropertyWebkitPrintColorAdjust: - return cssValuePool().createValue(style->printColorAdjust()); + return cssValuePool.createValue(style->printColorAdjust()); case CSSPropertyWebkitColumnAxis: - return cssValuePool().createValue(style->columnAxis()); - case CSSPropertyWebkitColumnCount: + return cssValuePool.createValue(style->columnAxis()); + case CSSPropertyColumnCount: if (style->hasAutoColumnCount()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return cssValuePool().createValue(style->columnCount(), CSSPrimitiveValue::CSS_NUMBER); - case CSSPropertyWebkitColumnGap: + return cssValuePool.createIdentifierValue(CSSValueAuto); + return cssValuePool.createValue(style->columnCount(), CSSPrimitiveValue::CSS_NUMBER); + case CSSPropertyColumnFill: + return cssValuePool.createValue(style->columnFill()); + case CSSPropertyColumnGap: if (style->hasNormalColumnGap()) - return cssValuePool().createIdentifierValue(CSSValueNormal); - return zoomAdjustedPixelValue(style->columnGap(), style.get()); - case CSSPropertyWebkitColumnProgression: - return cssValuePool().createValue(style->columnProgression()); - case CSSPropertyWebkitColumnRuleColor: - return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style.get(), style->columnRuleColor()); - case CSSPropertyWebkitColumnRuleStyle: - return cssValuePool().createValue(style->columnRuleStyle()); - case CSSPropertyWebkitColumnRuleWidth: - return zoomAdjustedPixelValue(style->columnRuleWidth(), style.get()); - case CSSPropertyWebkitColumnSpan: - return cssValuePool().createIdentifierValue(style->columnSpan() ? CSSValueAll : CSSValueNone); + return cssValuePool.createIdentifierValue(CSSValueNormal); + return zoomAdjustedPixelValue(style->columnGap(), *style); + case CSSPropertyColumnProgression: + return cssValuePool.createValue(style->columnProgression()); + case CSSPropertyColumnRuleColor: + return m_allowVisitedStyle ? cssValuePool.createColorValue(style->visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style.get(), style->columnRuleColor()); + case CSSPropertyColumnRuleStyle: + return cssValuePool.createValue(style->columnRuleStyle()); + case CSSPropertyColumnRuleWidth: + return zoomAdjustedPixelValue(style->columnRuleWidth(), *style); + case CSSPropertyColumnSpan: + return cssValuePool.createIdentifierValue(style->columnSpan() ? CSSValueAll : CSSValueNone); case CSSPropertyWebkitColumnBreakAfter: - return cssValuePool().createValue(style->columnBreakAfter()); + return cssValuePool.createValue(convertToColumnBreak(style->breakAfter())); case CSSPropertyWebkitColumnBreakBefore: - return cssValuePool().createValue(style->columnBreakBefore()); + return cssValuePool.createValue(convertToColumnBreak(style->breakBefore())); case CSSPropertyWebkitColumnBreakInside: - return cssValuePool().createValue(style->columnBreakInside()); - case CSSPropertyWebkitColumnWidth: + return cssValuePool.createValue(convertToColumnBreak(style->breakInside())); + case CSSPropertyColumnWidth: if (style->hasAutoColumnWidth()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return zoomAdjustedPixelValue(style->columnWidth(), style.get()); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return zoomAdjustedPixelValue(style->columnWidth(), *style); case CSSPropertyTabSize: - return cssValuePool().createValue(style->tabSize(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createValue(style->tabSize(), CSSPrimitiveValue::CSS_NUMBER); #if ENABLE(CSS_REGIONS) case CSSPropertyWebkitRegionBreakAfter: - return cssValuePool().createValue(style->regionBreakAfter()); + return cssValuePool.createValue(convertToRegionBreak(style->breakAfter())); case CSSPropertyWebkitRegionBreakBefore: - return cssValuePool().createValue(style->regionBreakBefore()); + return cssValuePool.createValue(convertToRegionBreak(style->breakBefore())); case CSSPropertyWebkitRegionBreakInside: - return cssValuePool().createValue(style->regionBreakInside()); + return cssValuePool.createValue(convertToRegionBreak(style->breakInside())); #endif case CSSPropertyCursor: { RefPtr<CSSValueList> list; @@ -1939,68 +2698,83 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert list = CSSValueList::createCommaSeparated(); for (unsigned i = 0; i < cursors->size(); ++i) if (StyleImage* image = cursors->at(i).image()) - list->append(image->cssValue()); + list->append(*image->cssValue()); } - RefPtr<CSSValue> value = cssValuePool().createValue(style->cursor()); + auto value = cssValuePool.createValue(style->cursor()); if (list) { - list->append(value.release()); - return list.release(); + list->append(WTFMove(value)); + return list; } - return value.release(); + return WTFMove(value); } #if ENABLE(CURSOR_VISIBILITY) case CSSPropertyWebkitCursorVisibility: - return cssValuePool().createValue(style->cursorVisibility()); + return cssValuePool.createValue(style->cursorVisibility()); #endif case CSSPropertyDirection: - return cssValuePool().createValue(style->direction()); + return cssValuePool.createValue(style->direction()); case CSSPropertyDisplay: - return cssValuePool().createValue(style->display()); + return cssValuePool.createValue(style->display()); case CSSPropertyEmptyCells: - return cssValuePool().createValue(style->emptyCells()); - case CSSPropertyWebkitAlignContent: - return cssValuePool().createValue(style->alignContent()); - case CSSPropertyWebkitAlignItems: - return cssValuePool().createValue(style->alignItems()); - case CSSPropertyWebkitAlignSelf: - if (style->alignSelf() == AlignAuto) { - Node* parent = styledNode->parentNode(); - if (parent && parent->computedStyle()) - return cssValuePool().createValue(parent->computedStyle()->alignItems()); - return cssValuePool().createValue(AlignStretch); - } - return cssValuePool().createValue(style->alignSelf()); - case CSSPropertyWebkitFlex: - return getCSSPropertyValuesForShorthandProperties(webkitFlexShorthand()); - case CSSPropertyWebkitFlexBasis: - return cssValuePool().createValue(style->flexBasis()); - case CSSPropertyWebkitFlexDirection: - return cssValuePool().createValue(style->flexDirection()); - case CSSPropertyWebkitFlexFlow: - return getCSSPropertyValuesForShorthandProperties(webkitFlexFlowShorthand()); - case CSSPropertyWebkitFlexGrow: - return cssValuePool().createValue(style->flexGrow()); - case CSSPropertyWebkitFlexShrink: - return cssValuePool().createValue(style->flexShrink()); - case CSSPropertyWebkitFlexWrap: - return cssValuePool().createValue(style->flexWrap()); - case CSSPropertyWebkitJustifyContent: - return cssValuePool().createValue(style->justifyContent()); - case CSSPropertyWebkitOrder: - return cssValuePool().createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createValue(style->emptyCells()); + case CSSPropertyAlignContent: { + ContentPosition position = style->alignContentPosition(); + ContentDistributionType distribution = style->alignContentDistribution(); + resolveContentAlignmentAuto(position, distribution, renderer); + return valueForContentPositionAndDistributionWithOverflowAlignment(position, distribution, style->alignContentOverflowAlignment()); + } + case CSSPropertyAlignItems: + return valueForItemPositionWithOverflowAlignment(resolveContainerAlignmentAuto(style->alignItemsPosition(), renderer), style->alignItemsOverflowAlignment(), NonLegacyPosition); + case CSSPropertyAlignSelf: { + OverflowAlignment overflow = style->alignSelfOverflowAlignment(); + ItemPosition alignSelf = resolveSelfAlignmentAuto(style->alignSelfPosition(), overflow, renderer); + return valueForItemPositionWithOverflowAlignment(alignSelf, overflow, NonLegacyPosition); + } + case CSSPropertyFlex: + return getCSSPropertyValuesForShorthandProperties(flexShorthand()); + case CSSPropertyFlexBasis: + return cssValuePool.createValue(style->flexBasis()); + case CSSPropertyFlexDirection: + return cssValuePool.createValue(style->flexDirection()); + case CSSPropertyFlexFlow: + return getCSSPropertyValuesForShorthandProperties(flexFlowShorthand()); + case CSSPropertyFlexGrow: + return cssValuePool.createValue(style->flexGrow()); + case CSSPropertyFlexShrink: + return cssValuePool.createValue(style->flexShrink()); + case CSSPropertyFlexWrap: + return cssValuePool.createValue(style->flexWrap()); + case CSSPropertyJustifyContent: { + ContentPosition position = style->justifyContentPosition(); + ContentDistributionType distribution = style->justifyContentDistribution(); + resolveContentAlignmentAuto(position, distribution, renderer); + return valueForContentPositionAndDistributionWithOverflowAlignment(position, distribution, style->justifyContentOverflowAlignment()); + } + case CSSPropertyJustifyItems: + return valueForItemPositionWithOverflowAlignment(resolveContainerAlignmentAuto(style->justifyItemsPosition(), renderer), style->justifyItemsOverflowAlignment(), style->justifyItemsPositionType()); + case CSSPropertyJustifySelf: { + OverflowAlignment overflow = style->justifySelfOverflowAlignment(); + ItemPosition justifySelf = resolveSelfAlignmentAuto(style->justifySelfPosition(), overflow, renderer); + return valueForItemPositionWithOverflowAlignment(justifySelf, overflow, NonLegacyPosition); + } + case CSSPropertyOrder: + return cssValuePool.createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyFloat: if (style->display() != NONE && style->hasOutOfFlowPosition()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return cssValuePool().createValue(style->floating()); + return cssValuePool.createIdentifierValue(CSSValueNone); + return cssValuePool.createValue(style->floating()); case CSSPropertyFont: { - RefPtr<FontValue> computedFont = FontValue::create(); + RefPtr<CSSFontValue> computedFont = CSSFontValue::create(); computedFont->style = fontStyleFromStyle(style.get()); - computedFont->variant = fontVariantFromStyle(style.get()); + if (style->fontDescription().variantCaps() == FontVariantCaps::Small) + computedFont->variant = CSSValuePool::singleton().createIdentifierValue(CSSValueSmallCaps); + else + computedFont->variant = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal); computedFont->weight = fontWeightFromStyle(style.get()); - computedFont->size = fontSizeFromStyle(style.get()); - computedFont->lineHeight = lineHeightFromStyle(style.get(), m_node->document()->renderView()); + computedFont->size = fontSizeFromStyle(*style); + computedFont->lineHeight = lineHeightFromStyle(*style); computedFont->family = fontFamilyFromStyle(style.get()); - return computedFont.release(); + return computedFont; } case CSSPropertyFontFamily: { RefPtr<CSSValueList> fontFamilyList = fontFamilyFromStyle(style.get()); @@ -2008,71 +2782,105 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert // NOTE: Gecko always returns this as a comma-separated CSSPrimitiveValue string. if (fontFamilyList->length() == 1) return fontFamilyList->item(0); - return fontFamilyList.release(); + return fontFamilyList; } case CSSPropertyFontSize: - return fontSizeFromStyle(style.get()); + return fontSizeFromStyle(*style); case CSSPropertyFontStyle: return fontStyleFromStyle(style.get()); case CSSPropertyFontVariant: return fontVariantFromStyle(style.get()); case CSSPropertyFontWeight: return fontWeightFromStyle(style.get()); - case CSSPropertyWebkitFontFeatureSettings: { - const FontFeatureSettings* featureSettings = style->fontDescription().featureSettings(); - if (!featureSettings || !featureSettings->size()) - return cssValuePool().createIdentifierValue(CSSValueNormal); + case CSSPropertyFontSynthesis: + return fontSynthesisFromStyle(*style); + case CSSPropertyFontFeatureSettings: { + const FontFeatureSettings& featureSettings = style->fontDescription().featureSettings(); + if (!featureSettings.size()) + return cssValuePool.createIdentifierValue(CSSValueNormal); RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); - for (unsigned i = 0; i < featureSettings->size(); ++i) { - const FontFeature& feature = featureSettings->at(i); - RefPtr<FontFeatureValue> featureValue = FontFeatureValue::create(feature.tag(), feature.value()); - list->append(featureValue.release()); - } - return list.release(); + for (auto& feature : featureSettings) + list->append(CSSFontFeatureValue::create(FontFeatureTag(feature.tag()), feature.value())); + return list; + } +#if ENABLE(CSS_GRID_LAYOUT) + case CSSPropertyWebkitGridAutoFlow: { + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); + ASSERT(style->isGridAutoFlowDirectionRow() || style->isGridAutoFlowDirectionColumn()); + if (style->isGridAutoFlowDirectionRow()) + list->append(cssValuePool.createIdentifierValue(CSSValueRow)); + else + list->append(cssValuePool.createIdentifierValue(CSSValueColumn)); + + if (style->isGridAutoFlowAlgorithmDense()) + list->append(cssValuePool.createIdentifierValue(CSSValueDense)); + + return list; } + + // Specs mention that getComputedStyle() should return the used value of the property instead of the computed + // one for grid-definition-{rows|columns} but not for the grid-auto-{rows|columns} as things like + // grid-auto-columns: 2fr; cannot be resolved to a value in pixels as the '2fr' means very different things + // depending on the size of the explicit grid or the number of implicit tracks added to the grid. See + // http://lists.w3.org/Archives/Public/www-style/2013Nov/0014.html case CSSPropertyWebkitGridAutoColumns: - return valueForGridTrackSize(style->gridAutoColumns(), style.get(), m_node->document()->renderView()); - case CSSPropertyWebkitGridAutoFlow: - return cssValuePool().createValue(style->gridAutoFlow()); + return specifiedValueForGridTrackSize(style->gridAutoColumns(), *style); case CSSPropertyWebkitGridAutoRows: - return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_node->document()->renderView()); - case CSSPropertyWebkitGridDefinitionColumns: - return valueForGridTrackList(style->gridColumns(), style.get(), m_node->document()->renderView()); - case CSSPropertyWebkitGridDefinitionRows: - return valueForGridTrackList(style->gridRows(), style.get(), m_node->document()->renderView()); - - case CSSPropertyWebkitGridStart: - return valueForGridPosition(style->gridItemStart()); - case CSSPropertyWebkitGridEnd: - return valueForGridPosition(style->gridItemEnd()); - case CSSPropertyWebkitGridBefore: - return valueForGridPosition(style->gridItemBefore()); - case CSSPropertyWebkitGridAfter: - return valueForGridPosition(style->gridItemAfter()); + return specifiedValueForGridTrackSize(style->gridAutoRows(), *style); + + case CSSPropertyWebkitGridTemplateColumns: + return valueForGridTrackList(ForColumns, renderer, *style); + case CSSPropertyWebkitGridTemplateRows: + return valueForGridTrackList(ForRows, renderer, *style); + + case CSSPropertyWebkitGridColumnStart: + return valueForGridPosition(style->gridItemColumnStart()); + case CSSPropertyWebkitGridColumnEnd: + return valueForGridPosition(style->gridItemColumnEnd()); + case CSSPropertyWebkitGridRowStart: + return valueForGridPosition(style->gridItemRowStart()); + case CSSPropertyWebkitGridRowEnd: + return valueForGridPosition(style->gridItemRowEnd()); + case CSSPropertyWebkitGridArea: + return getCSSPropertyValuesForGridShorthand(webkitGridAreaShorthand()); + case CSSPropertyWebkitGridTemplate: + return getCSSPropertyValuesForGridShorthand(webkitGridTemplateShorthand()); + case CSSPropertyWebkitGrid: + return getCSSPropertyValuesForGridShorthand(webkitGridShorthand()); case CSSPropertyWebkitGridColumn: return getCSSPropertyValuesForGridShorthand(webkitGridColumnShorthand()); case CSSPropertyWebkitGridRow: return getCSSPropertyValuesForGridShorthand(webkitGridRowShorthand()); + case CSSPropertyWebkitGridTemplateAreas: + if (!style->namedGridAreaRowCount()) { + ASSERT(!style->namedGridAreaColumnCount()); + return cssValuePool.createIdentifierValue(CSSValueNone); + } + + return CSSGridTemplateAreasValue::create(style->namedGridArea(), style->namedGridAreaRowCount(), style->namedGridAreaColumnCount()); + case CSSPropertyWebkitGridColumnGap: + return zoomAdjustedPixelValueForLength(style->gridColumnGap(), *style); + case CSSPropertyWebkitGridRowGap: + return zoomAdjustedPixelValueForLength(style->gridRowGap(), *style); + case CSSPropertyWebkitGridGap: + return getCSSPropertyValuesForGridShorthand(webkitGridGapShorthand()); +#endif /* ENABLE(CSS_GRID_LAYOUT) */ case CSSPropertyHeight: - if (renderer) { + if (renderer && !renderer->isRenderSVGModelObject()) { // According to http://www.w3.org/TR/CSS2/visudet.html#the-height-property, // the "height" property does not apply for non-replaced inline elements. if (!renderer->isReplaced() && renderer->isInline()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return zoomAdjustedPixelValue(sizingBox(renderer).height(), style.get()); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return zoomAdjustedPixelValue(sizingBox(*renderer).height(), *style); } - return zoomAdjustedPixelValueForLength(style->height(), style.get()); - case CSSPropertyWebkitHighlight: - if (style->highlight() == nullAtom) - return cssValuePool().createIdentifierValue(CSSValueNone); - return cssValuePool().createValue(style->highlight(), CSSPrimitiveValue::CSS_STRING); + return zoomAdjustedPixelValueForLength(style->height(), *style); case CSSPropertyWebkitHyphens: - return cssValuePool().createValue(style->hyphens()); + return cssValuePool.createValue(style->hyphens()); case CSSPropertyWebkitHyphenateCharacter: if (style->hyphenationString().isNull()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return cssValuePool().createValue(style->hyphenationString(), CSSPrimitiveValue::CSS_STRING); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return cssValuePool.createValue(style->hyphenationString(), CSSPrimitiveValue::CSS_STRING); case CSSPropertyWebkitHyphenateLimitAfter: if (style->hyphenationLimitAfter() < 0) return CSSPrimitiveValue::createIdentifier(CSSValueAuto); @@ -2087,165 +2895,178 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert return CSSPrimitiveValue::create(style->hyphenationLimitLines(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyWebkitBorderFit: if (style->borderFit() == BorderFitBorder) - return cssValuePool().createIdentifierValue(CSSValueBorder); - return cssValuePool().createIdentifierValue(CSSValueLines); + return cssValuePool.createIdentifierValue(CSSValueBorder); + return cssValuePool.createIdentifierValue(CSSValueLines); #if ENABLE(CSS_IMAGE_ORIENTATION) case CSSPropertyImageOrientation: - return cssValuePool().createValue(style->imageOrientation()); + return cssValuePool.createValue(style->imageOrientation()); #endif case CSSPropertyImageRendering: return CSSPrimitiveValue::create(style->imageRendering()); #if ENABLE(CSS_IMAGE_RESOLUTION) case CSSPropertyImageResolution: - return cssValuePool().createValue(style->imageResolution(), CSSPrimitiveValue::CSS_DPPX); + return cssValuePool.createValue(style->imageResolution(), CSSPrimitiveValue::CSS_DPPX); #endif case CSSPropertyLeft: - return getPositionOffsetValue(style.get(), CSSPropertyLeft, m_node->document()->renderView()); + return positionOffsetValue(*style, CSSPropertyLeft); case CSSPropertyLetterSpacing: if (!style->letterSpacing()) - return cssValuePool().createIdentifierValue(CSSValueNormal); - return zoomAdjustedPixelValue(style->letterSpacing(), style.get()); + return cssValuePool.createIdentifierValue(CSSValueNormal); + return zoomAdjustedPixelValue(style->letterSpacing(), *style); case CSSPropertyWebkitLineClamp: if (style->lineClamp().isNone()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return cssValuePool().createValue(style->lineClamp().value(), style->lineClamp().isPercentage() ? CSSPrimitiveValue::CSS_PERCENTAGE : CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createIdentifierValue(CSSValueNone); + return cssValuePool.createValue(style->lineClamp().value(), style->lineClamp().isPercentage() ? CSSPrimitiveValue::CSS_PERCENTAGE : CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyLineHeight: - return lineHeightFromStyle(style.get(), m_node->document()->renderView()); + return lineHeightFromStyle(*style); case CSSPropertyListStyleImage: if (style->listStyleImage()) return style->listStyleImage()->cssValue(); - return cssValuePool().createIdentifierValue(CSSValueNone); + return cssValuePool.createIdentifierValue(CSSValueNone); case CSSPropertyListStylePosition: - return cssValuePool().createValue(style->listStylePosition()); + return cssValuePool.createValue(style->listStylePosition()); case CSSPropertyListStyleType: - return cssValuePool().createValue(style->listStyleType()); + return cssValuePool.createValue(style->listStyleType()); case CSSPropertyWebkitLocale: if (style->locale().isNull()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return cssValuePool().createValue(style->locale(), CSSPrimitiveValue::CSS_STRING); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return cssValuePool.createValue(style->locale(), CSSPrimitiveValue::CSS_STRING); case CSSPropertyMarginTop: - return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::marginTop, &RenderBoxModelObject::marginTop>(style.get(), renderer); + return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::marginTop, &RenderBoxModelObject::marginTop>(*style, renderer); case CSSPropertyMarginRight: { Length marginRight = style->marginRight(); - if (marginRight.isFixed() || !renderer || !renderer->isBox()) - return zoomAdjustedPixelValueForLength(marginRight, style.get()); + if (marginRight.isFixed() || !is<RenderBox>(renderer)) + return zoomAdjustedPixelValueForLength(marginRight, *style); float value; - if (marginRight.isPercent() || marginRight.isViewportPercentage()) + if (marginRight.isPercentOrCalculated()) { // RenderBox gives a marginRight() that is the distance between the right-edge of the child box // and the right-edge of the containing box, when display == BLOCK. Let's calculate the absolute // value of the specified margin-right % instead of relying on RenderBox's marginRight() value. - value = minimumValueForLength(marginRight, toRenderBox(renderer)->containingBlockLogicalWidthForContent(), m_node->document()->renderView()); - else - value = toRenderBox(renderer)->marginRight(); - return zoomAdjustedPixelValue(value, style.get()); + value = minimumValueForLength(marginRight, downcast<RenderBox>(*renderer).containingBlockLogicalWidthForContent()); + } else + value = downcast<RenderBox>(*renderer).marginRight(); + return zoomAdjustedPixelValue(value, *style); } case CSSPropertyMarginBottom: - return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::marginBottom, &RenderBoxModelObject::marginBottom>(style.get(), renderer); + return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::marginBottom, &RenderBoxModelObject::marginBottom>(*style, renderer); case CSSPropertyMarginLeft: - return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::marginLeft, &RenderBoxModelObject::marginLeft>(style.get(), renderer); + return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::marginLeft, &RenderBoxModelObject::marginLeft>(*style, renderer); case CSSPropertyWebkitMarqueeDirection: - return cssValuePool().createValue(style->marqueeDirection()); + return cssValuePool.createValue(style->marqueeDirection()); case CSSPropertyWebkitMarqueeIncrement: - return cssValuePool().createValue(style->marqueeIncrement()); + return cssValuePool.createValue(style->marqueeIncrement()); case CSSPropertyWebkitMarqueeRepetition: if (style->marqueeLoopCount() < 0) - return cssValuePool().createIdentifierValue(CSSValueInfinite); - return cssValuePool().createValue(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createIdentifierValue(CSSValueInfinite); + return cssValuePool.createValue(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyWebkitMarqueeStyle: - return cssValuePool().createValue(style->marqueeBehavior()); + return cssValuePool.createValue(style->marqueeBehavior()); case CSSPropertyWebkitUserModify: - return cssValuePool().createValue(style->userModify()); + return cssValuePool.createValue(style->userModify()); case CSSPropertyMaxHeight: { const Length& maxHeight = style->maxHeight(); if (maxHeight.isUndefined()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return zoomAdjustedPixelValueForLength(maxHeight, style.get()); + return cssValuePool.createIdentifierValue(CSSValueNone); + return zoomAdjustedPixelValueForLength(maxHeight, *style); } case CSSPropertyMaxWidth: { const Length& maxWidth = style->maxWidth(); if (maxWidth.isUndefined()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return zoomAdjustedPixelValueForLength(maxWidth, style.get()); + return cssValuePool.createIdentifierValue(CSSValueNone); + return zoomAdjustedPixelValueForLength(maxWidth, *style); } case CSSPropertyMinHeight: - // FIXME: For flex-items, min-height:auto should compute to min-content. - if (style->minHeight().isAuto()) - return zoomAdjustedPixelValue(0, style.get()); - return zoomAdjustedPixelValueForLength(style->minHeight(), style.get()); + if (style->minHeight().isAuto()) { + if (isFlexOrGrid(styledNode->parentNode())) + return cssValuePool.createIdentifierValue(CSSValueAuto); + return zoomAdjustedPixelValue(0, *style); + } + return zoomAdjustedPixelValueForLength(style->minHeight(), *style); case CSSPropertyMinWidth: - // FIXME: For flex-items, min-width:auto should compute to min-content. - if (style->minWidth().isAuto()) - return zoomAdjustedPixelValue(0, style.get()); - return zoomAdjustedPixelValueForLength(style->minWidth(), style.get()); + if (style->minWidth().isAuto()) { + if (isFlexOrGrid(styledNode->parentNode())) + return cssValuePool.createIdentifierValue(CSSValueAuto); + return zoomAdjustedPixelValue(0, *style); + } + return zoomAdjustedPixelValueForLength(style->minWidth(), *style); + case CSSPropertyObjectFit: + return cssValuePool.createValue(style->objectFit()); case CSSPropertyOpacity: - return cssValuePool().createValue(style->opacity(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createValue(style->opacity(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyOrphans: if (style->hasAutoOrphans()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return cssValuePool().createValue(style->orphans(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return cssValuePool.createValue(style->orphans(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyOutlineColor: - return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style.get(), style->outlineColor()); + return m_allowVisitedStyle ? cssValuePool.createColorValue(style->visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style.get(), style->outlineColor()); case CSSPropertyOutlineOffset: - return zoomAdjustedPixelValue(style->outlineOffset(), style.get()); + return zoomAdjustedPixelValue(style->outlineOffset(), *style); case CSSPropertyOutlineStyle: if (style->outlineStyleIsAuto()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return cssValuePool().createValue(style->outlineStyle()); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return cssValuePool.createValue(style->outlineStyle()); case CSSPropertyOutlineWidth: - return zoomAdjustedPixelValue(style->outlineWidth(), style.get()); + return zoomAdjustedPixelValue(style->outlineWidth(), *style); case CSSPropertyOverflow: - return cssValuePool().createValue(max(style->overflowX(), style->overflowY())); + return cssValuePool.createValue(std::max(style->overflowX(), style->overflowY())); case CSSPropertyOverflowWrap: - return cssValuePool().createValue(style->overflowWrap()); + return cssValuePool.createValue(style->overflowWrap()); case CSSPropertyOverflowX: - return cssValuePool().createValue(style->overflowX()); + return cssValuePool.createValue(style->overflowX()); case CSSPropertyOverflowY: - return cssValuePool().createValue(style->overflowY()); + return cssValuePool.createValue(style->overflowY()); case CSSPropertyPaddingTop: - return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::paddingTop, &RenderBoxModelObject::computedCSSPaddingTop>(style.get(), renderer); + return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::paddingTop, &RenderBoxModelObject::computedCSSPaddingTop>(*style, renderer); case CSSPropertyPaddingRight: - return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::paddingRight, &RenderBoxModelObject::computedCSSPaddingRight>(style.get(), renderer); + return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::paddingRight, &RenderBoxModelObject::computedCSSPaddingRight>(*style, renderer); case CSSPropertyPaddingBottom: - return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::paddingBottom, &RenderBoxModelObject::computedCSSPaddingBottom>(style.get(), renderer); + return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::paddingBottom, &RenderBoxModelObject::computedCSSPaddingBottom>(*style, renderer); case CSSPropertyPaddingLeft: - return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::paddingLeft, &RenderBoxModelObject::computedCSSPaddingLeft>(style.get(), renderer); + return zoomAdjustedPaddingOrMarginPixelValue<&RenderStyle::paddingLeft, &RenderBoxModelObject::computedCSSPaddingLeft>(*style, renderer); case CSSPropertyPageBreakAfter: - return cssValuePool().createValue(style->pageBreakAfter()); + return cssValuePool.createValue(convertToPageBreak(style->breakAfter())); case CSSPropertyPageBreakBefore: - return cssValuePool().createValue(style->pageBreakBefore()); - case CSSPropertyPageBreakInside: { - EPageBreak pageBreak = style->pageBreakInside(); - ASSERT(pageBreak != PBALWAYS); - if (pageBreak == PBALWAYS) - return 0; - return cssValuePool().createValue(style->pageBreakInside()); - } + return cssValuePool.createValue(convertToPageBreak(style->breakBefore())); + case CSSPropertyPageBreakInside: + return cssValuePool.createValue(convertToPageBreak(style->breakInside())); + case CSSPropertyBreakAfter: + return cssValuePool.createValue(style->breakAfter()); + case CSSPropertyBreakBefore: + return cssValuePool.createValue(style->breakBefore()); + case CSSPropertyBreakInside: + return cssValuePool.createValue(style->breakInside()); + case CSSPropertyHangingPunctuation: + return hangingPunctuationToCSSValue(style->hangingPunctuation()); case CSSPropertyPosition: - return cssValuePool().createValue(style->position()); + return cssValuePool.createValue(style->position()); case CSSPropertyRight: - return getPositionOffsetValue(style.get(), CSSPropertyRight, m_node->document()->renderView()); + return positionOffsetValue(*style, CSSPropertyRight); case CSSPropertyWebkitRubyPosition: - return cssValuePool().createValue(style->rubyPosition()); + return cssValuePool.createValue(style->rubyPosition()); case CSSPropertyTableLayout: - return cssValuePool().createValue(style->tableLayout()); + return cssValuePool.createValue(style->tableLayout()); case CSSPropertyTextAlign: - return cssValuePool().createValue(style->textAlign()); + return cssValuePool.createValue(style->textAlign()); case CSSPropertyTextDecoration: return renderTextDecorationFlagsToCSSValue(style->textDecoration()); #if ENABLE(CSS3_TEXT) + case CSSPropertyWebkitTextAlignLast: + return cssValuePool.createValue(style->textAlignLast()); + case CSSPropertyWebkitTextJustify: + return cssValuePool.createValue(style->textJustify()); +#endif // CSS3_TEXT + case CSSPropertyWebkitTextDecoration: + return getCSSPropertyValuesForShorthandProperties(webkitTextDecorationShorthand()); case CSSPropertyWebkitTextDecorationLine: return renderTextDecorationFlagsToCSSValue(style->textDecoration()); case CSSPropertyWebkitTextDecorationStyle: return renderTextDecorationStyleFlagsToCSSValue(style->textDecorationStyle()); case CSSPropertyWebkitTextDecorationColor: return currentColorOrValidColor(style.get(), style->textDecorationColor()); - case CSSPropertyWebkitTextAlignLast: - return cssValuePool().createValue(style->textAlignLast()); - case CSSPropertyWebkitTextJustify: - return cssValuePool().createValue(style->textJustify()); + case CSSPropertyWebkitTextDecorationSkip: + return renderTextDecorationSkipFlagsToCSSValue(style->textDecorationSkip()); case CSSPropertyWebkitTextUnderlinePosition: - return cssValuePool().createValue(style->textUnderlinePosition()); -#endif // CSS3_TEXT + return cssValuePool.createValue(style->textUnderlinePosition()); case CSSPropertyWebkitTextDecorationsInEffect: return renderTextDecorationFlagsToCSSValue(style->textDecorationsInEffect()); case CSSPropertyWebkitTextFillColor: @@ -2253,279 +3074,309 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert case CSSPropertyWebkitTextEmphasisColor: return currentColorOrValidColor(style.get(), style->textEmphasisColor()); case CSSPropertyWebkitTextEmphasisPosition: - return cssValuePool().createValue(style->textEmphasisPosition()); + return renderEmphasisPositionFlagsToCSSValue(style->textEmphasisPosition()); case CSSPropertyWebkitTextEmphasisStyle: switch (style->textEmphasisMark()) { case TextEmphasisMarkNone: - return cssValuePool().createIdentifierValue(CSSValueNone); + return cssValuePool.createIdentifierValue(CSSValueNone); case TextEmphasisMarkCustom: - return cssValuePool().createValue(style->textEmphasisCustomMark(), CSSPrimitiveValue::CSS_STRING); + return cssValuePool.createValue(style->textEmphasisCustomMark(), CSSPrimitiveValue::CSS_STRING); case TextEmphasisMarkAuto: ASSERT_NOT_REACHED(); - // Fall through +#if ASSERT_DISABLED + FALLTHROUGH; +#endif case TextEmphasisMarkDot: case TextEmphasisMarkCircle: case TextEmphasisMarkDoubleCircle: case TextEmphasisMarkTriangle: case TextEmphasisMarkSesame: { RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - list->append(cssValuePool().createValue(style->textEmphasisFill())); - list->append(cssValuePool().createValue(style->textEmphasisMark())); - return list.release(); + list->append(cssValuePool.createValue(style->textEmphasisFill())); + list->append(cssValuePool.createValue(style->textEmphasisMark())); + return list; } } case CSSPropertyTextIndent: { // If CSS3_TEXT is disabled or text-indent has only one value(<length> | <percentage>), // getPropertyCSSValue() returns CSSValue. - RefPtr<CSSValue> textIndent = zoomAdjustedPixelValueForLength(style->textIndent(), style.get()); + RefPtr<CSSValue> textIndent = zoomAdjustedPixelValueForLength(style->textIndent(), *style); #if ENABLE(CSS3_TEXT) // If CSS3_TEXT is enabled and text-indent has -webkit-each-line or -webkit-hanging, // getPropertyCSSValue() returns CSSValueList. if (style->textIndentLine() == TextIndentEachLine || style->textIndentType() == TextIndentHanging) { RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - list->append(textIndent.release()); + list->append(textIndent.releaseNonNull()); if (style->textIndentLine() == TextIndentEachLine) - list->append(cssValuePool().createIdentifierValue(CSSValueWebkitEachLine)); + list->append(cssValuePool.createIdentifierValue(CSSValueWebkitEachLine)); if (style->textIndentType() == TextIndentHanging) - list->append(cssValuePool().createIdentifierValue(CSSValueWebkitHanging)); - return list.release(); + list->append(cssValuePool.createIdentifierValue(CSSValueWebkitHanging)); + return list; } #endif - return textIndent.release(); + return textIndent; } case CSSPropertyTextShadow: - return valueForShadow(style->textShadow(), propertyID, style.get()); + return valueForShadow(style->textShadow(), propertyID, *style); case CSSPropertyTextRendering: - return cssValuePool().createValue(style->fontDescription().textRenderingMode()); + return cssValuePool.createValue(style->fontDescription().textRenderingMode()); case CSSPropertyTextOverflow: if (style->textOverflow()) - return cssValuePool().createIdentifierValue(CSSValueEllipsis); - return cssValuePool().createIdentifierValue(CSSValueClip); + return cssValuePool.createIdentifierValue(CSSValueEllipsis); + return cssValuePool.createIdentifierValue(CSSValueClip); case CSSPropertyWebkitTextSecurity: - return cssValuePool().createValue(style->textSecurity()); + return cssValuePool.createValue(style->textSecurity()); +#if ENABLE(IOS_TEXT_AUTOSIZING) + case CSSPropertyWebkitTextSizeAdjust: + if (style->textSizeAdjust().isAuto()) + return cssValuePool.createIdentifierValue(CSSValueAuto); + if (style->textSizeAdjust().isNone()) + return cssValuePool.createIdentifierValue(CSSValueNone); + return CSSPrimitiveValue::create(style->textSizeAdjust().percentage(), CSSPrimitiveValue::CSS_PERCENTAGE); +#endif case CSSPropertyWebkitTextStrokeColor: return currentColorOrValidColor(style.get(), style->textStrokeColor()); case CSSPropertyWebkitTextStrokeWidth: - return zoomAdjustedPixelValue(style->textStrokeWidth(), style.get()); + return zoomAdjustedPixelValue(style->textStrokeWidth(), *style); case CSSPropertyTextTransform: - return cssValuePool().createValue(style->textTransform()); + return cssValuePool.createValue(style->textTransform()); case CSSPropertyTop: - return getPositionOffsetValue(style.get(), CSSPropertyTop, m_node->document()->renderView()); + return positionOffsetValue(*style, CSSPropertyTop); case CSSPropertyUnicodeBidi: - return cssValuePool().createValue(style->unicodeBidi()); + return cssValuePool.createValue(style->unicodeBidi()); case CSSPropertyVerticalAlign: switch (style->verticalAlign()) { case BASELINE: - return cssValuePool().createIdentifierValue(CSSValueBaseline); + return cssValuePool.createIdentifierValue(CSSValueBaseline); case MIDDLE: - return cssValuePool().createIdentifierValue(CSSValueMiddle); + return cssValuePool.createIdentifierValue(CSSValueMiddle); case SUB: - return cssValuePool().createIdentifierValue(CSSValueSub); + return cssValuePool.createIdentifierValue(CSSValueSub); case SUPER: - return cssValuePool().createIdentifierValue(CSSValueSuper); + return cssValuePool.createIdentifierValue(CSSValueSuper); case TEXT_TOP: - return cssValuePool().createIdentifierValue(CSSValueTextTop); + return cssValuePool.createIdentifierValue(CSSValueTextTop); case TEXT_BOTTOM: - return cssValuePool().createIdentifierValue(CSSValueTextBottom); + return cssValuePool.createIdentifierValue(CSSValueTextBottom); case TOP: - return cssValuePool().createIdentifierValue(CSSValueTop); + return cssValuePool.createIdentifierValue(CSSValueTop); case BOTTOM: - return cssValuePool().createIdentifierValue(CSSValueBottom); + return cssValuePool.createIdentifierValue(CSSValueBottom); case BASELINE_MIDDLE: - return cssValuePool().createIdentifierValue(CSSValueWebkitBaselineMiddle); + return cssValuePool.createIdentifierValue(CSSValueWebkitBaselineMiddle); case LENGTH: - return cssValuePool().createValue(style->verticalAlignLength()); + return cssValuePool.createValue(style->verticalAlignLength()); } ASSERT_NOT_REACHED(); - return 0; + return nullptr; case CSSPropertyVisibility: - return cssValuePool().createValue(style->visibility()); + return cssValuePool.createValue(style->visibility()); case CSSPropertyWhiteSpace: - return cssValuePool().createValue(style->whiteSpace()); + return cssValuePool.createValue(style->whiteSpace()); case CSSPropertyWidows: if (style->hasAutoWidows()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return cssValuePool().createValue(style->widows(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return cssValuePool.createValue(style->widows(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyWidth: - if (renderer) { + if (renderer && !renderer->isRenderSVGModelObject()) { // According to http://www.w3.org/TR/CSS2/visudet.html#the-width-property, // the "width" property does not apply for non-replaced inline elements. if (!renderer->isReplaced() && renderer->isInline()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return zoomAdjustedPixelValue(sizingBox(renderer).width(), style.get()); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return zoomAdjustedPixelValue(sizingBox(*renderer).width(), *style); } - return zoomAdjustedPixelValueForLength(style->width(), style.get()); + return zoomAdjustedPixelValueForLength(style->width(), *style); + case CSSPropertyWillChange: + return getWillChangePropertyValue(style->willChange()); + break; case CSSPropertyWordBreak: - return cssValuePool().createValue(style->wordBreak()); + return cssValuePool.createValue(style->wordBreak()); case CSSPropertyWordSpacing: - return zoomAdjustedPixelValue(style->wordSpacing(), style.get()); + return zoomAdjustedPixelValue(style->fontCascade().wordSpacing(), *style); case CSSPropertyWordWrap: - return cssValuePool().createValue(style->overflowWrap()); + return cssValuePool.createValue(style->overflowWrap()); case CSSPropertyWebkitLineBreak: - return cssValuePool().createValue(style->lineBreak()); + return cssValuePool.createValue(style->lineBreak()); case CSSPropertyWebkitNbspMode: - return cssValuePool().createValue(style->nbspMode()); + return cssValuePool.createValue(style->nbspMode()); case CSSPropertyResize: - return cssValuePool().createValue(style->resize()); + return cssValuePool.createValue(style->resize()); case CSSPropertyWebkitFontKerning: - return cssValuePool().createValue(style->fontDescription().kerning()); + return cssValuePool.createValue(style->fontDescription().kerning()); case CSSPropertyWebkitFontSmoothing: - return cssValuePool().createValue(style->fontDescription().fontSmoothing()); - case CSSPropertyWebkitFontVariantLigatures: { - FontDescription::LigaturesState commonLigaturesState = style->fontDescription().commonLigaturesState(); - FontDescription::LigaturesState discretionaryLigaturesState = style->fontDescription().discretionaryLigaturesState(); - FontDescription::LigaturesState historicalLigaturesState = style->fontDescription().historicalLigaturesState(); - if (commonLigaturesState == FontDescription::NormalLigaturesState && discretionaryLigaturesState == FontDescription::NormalLigaturesState - && historicalLigaturesState == FontDescription::NormalLigaturesState) - return cssValuePool().createIdentifierValue(CSSValueNormal); - - RefPtr<CSSValueList> valueList = CSSValueList::createSpaceSeparated(); - if (commonLigaturesState != FontDescription::NormalLigaturesState) - valueList->append(cssValuePool().createIdentifierValue(commonLigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoCommonLigatures : CSSValueCommonLigatures)); - if (discretionaryLigaturesState != FontDescription::NormalLigaturesState) - valueList->append(cssValuePool().createIdentifierValue(discretionaryLigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoDiscretionaryLigatures : CSSValueDiscretionaryLigatures)); - if (historicalLigaturesState != FontDescription::NormalLigaturesState) - valueList->append(cssValuePool().createIdentifierValue(historicalLigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoHistoricalLigatures : CSSValueHistoricalLigatures)); - return valueList; - } + return cssValuePool.createValue(style->fontDescription().fontSmoothing()); + case CSSPropertyFontVariantLigatures: + return fontVariantLigaturesPropertyValue(style->fontDescription().variantCommonLigatures(), style->fontDescription().variantDiscretionaryLigatures(), style->fontDescription().variantHistoricalLigatures(), style->fontDescription().variantContextualAlternates()); + case CSSPropertyFontVariantPosition: + return fontVariantPositionPropertyValue(style->fontDescription().variantPosition()); + case CSSPropertyFontVariantCaps: + return fontVariantCapsPropertyValue(style->fontDescription().variantCaps()); + case CSSPropertyFontVariantNumeric: + return fontVariantNumericPropertyValue(style->fontDescription().variantNumericFigure(), style->fontDescription().variantNumericSpacing(), style->fontDescription().variantNumericFraction(), style->fontDescription().variantNumericOrdinal(), style->fontDescription().variantNumericSlashedZero()); + case CSSPropertyFontVariantAlternates: + return fontVariantAlternatesPropertyValue(style->fontDescription().variantAlternates()); + case CSSPropertyFontVariantEastAsian: + return fontVariantEastAsianPropertyValue(style->fontDescription().variantEastAsianVariant(), style->fontDescription().variantEastAsianWidth(), style->fontDescription().variantEastAsianRuby()); case CSSPropertyZIndex: if (style->hasAutoZIndex()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return cssValuePool().createValue(style->zIndex(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return cssValuePool.createValue(style->zIndex(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyZoom: - return cssValuePool().createValue(style->zoom(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createValue(style->zoom(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyBoxSizing: if (style->boxSizing() == CONTENT_BOX) - return cssValuePool().createIdentifierValue(CSSValueContentBox); - return cssValuePool().createIdentifierValue(CSSValueBorderBox); + return cssValuePool.createIdentifierValue(CSSValueContentBox); + return cssValuePool.createIdentifierValue(CSSValueBorderBox); #if ENABLE(DASHBOARD_SUPPORT) case CSSPropertyWebkitDashboardRegion: { const Vector<StyleDashboardRegion>& regions = style->dashboardRegions(); unsigned count = regions.size(); if (count == 1 && regions[0].type == StyleDashboardRegion::None) - return cssValuePool().createIdentifierValue(CSSValueNone); + return cssValuePool.createIdentifierValue(CSSValueNone); RefPtr<DashboardRegion> firstRegion; - DashboardRegion* previousRegion = 0; + DashboardRegion* previousRegion = nullptr; for (unsigned i = 0; i < count; i++) { - RefPtr<DashboardRegion> region = DashboardRegion::create(); + auto region = DashboardRegion::create(); StyleDashboardRegion styleRegion = regions[i]; region->m_label = styleRegion.label; LengthBox offset = styleRegion.offset; - region->setTop(zoomAdjustedPixelValue(offset.top().value(), style.get())); - region->setRight(zoomAdjustedPixelValue(offset.right().value(), style.get())); - region->setBottom(zoomAdjustedPixelValue(offset.bottom().value(), style.get())); - region->setLeft(zoomAdjustedPixelValue(offset.left().value(), style.get())); + region->setTop(zoomAdjustedPixelValue(offset.top().value(), *style)); + region->setRight(zoomAdjustedPixelValue(offset.right().value(), *style)); + region->setBottom(zoomAdjustedPixelValue(offset.bottom().value(), *style)); + region->setLeft(zoomAdjustedPixelValue(offset.left().value(), *style)); region->m_isRectangle = (styleRegion.type == StyleDashboardRegion::Rectangle); region->m_isCircle = (styleRegion.type == StyleDashboardRegion::Circle); if (previousRegion) - previousRegion->m_next = region; + previousRegion->m_next = region.copyRef(); else - firstRegion = region; - previousRegion = region.get(); + firstRegion = region.copyRef(); + previousRegion = region.ptr(); } - return cssValuePool().createValue(firstRegion.release()); + return cssValuePool.createValue(WTFMove(firstRegion)); } #endif -#if ENABLE(DRAGGABLE_REGION) - case CSSPropertyWebkitAppRegion: - return cssValuePool().createIdentifierValue(style->getDraggableRegionMode() == DraggableRegionDrag ? CSSValueDrag : CSSValueNoDrag); -#endif + case CSSPropertyAnimationDelay: case CSSPropertyWebkitAnimationDelay: return getDelayValue(style->animations()); + case CSSPropertyAnimationDirection: case CSSPropertyWebkitAnimationDirection: { RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); const AnimationList* t = style->animations(); if (t) { for (size_t i = 0; i < t->size(); ++i) { - if (t->animation(i)->direction()) - list->append(cssValuePool().createIdentifierValue(CSSValueAlternate)); - else - list->append(cssValuePool().createIdentifierValue(CSSValueNormal)); + switch (t->animation(i).direction()) { + case Animation::AnimationDirectionNormal: + list->append(cssValuePool.createIdentifierValue(CSSValueNormal)); + break; + case Animation::AnimationDirectionAlternate: + list->append(cssValuePool.createIdentifierValue(CSSValueAlternate)); + break; + case Animation::AnimationDirectionReverse: + list->append(cssValuePool.createIdentifierValue(CSSValueReverse)); + break; + case Animation::AnimationDirectionAlternateReverse: + list->append(cssValuePool.createIdentifierValue(CSSValueAlternateReverse)); + break; + } } } else - list->append(cssValuePool().createIdentifierValue(CSSValueNormal)); - return list.release(); + list->append(cssValuePool.createIdentifierValue(CSSValueNormal)); + return list; } + case CSSPropertyAnimationDuration: case CSSPropertyWebkitAnimationDuration: return getDurationValue(style->animations()); + case CSSPropertyAnimationFillMode: case CSSPropertyWebkitAnimationFillMode: { RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); const AnimationList* t = style->animations(); if (t) { for (size_t i = 0; i < t->size(); ++i) { - switch (t->animation(i)->fillMode()) { + switch (t->animation(i).fillMode()) { case AnimationFillModeNone: - list->append(cssValuePool().createIdentifierValue(CSSValueNone)); + list->append(cssValuePool.createIdentifierValue(CSSValueNone)); break; case AnimationFillModeForwards: - list->append(cssValuePool().createIdentifierValue(CSSValueForwards)); + list->append(cssValuePool.createIdentifierValue(CSSValueForwards)); break; case AnimationFillModeBackwards: - list->append(cssValuePool().createIdentifierValue(CSSValueBackwards)); + list->append(cssValuePool.createIdentifierValue(CSSValueBackwards)); break; case AnimationFillModeBoth: - list->append(cssValuePool().createIdentifierValue(CSSValueBoth)); + list->append(cssValuePool.createIdentifierValue(CSSValueBoth)); break; } } } else - list->append(cssValuePool().createIdentifierValue(CSSValueNone)); - return list.release(); + list->append(cssValuePool.createIdentifierValue(CSSValueNone)); + return list; } + case CSSPropertyAnimationIterationCount: case CSSPropertyWebkitAnimationIterationCount: { RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); const AnimationList* t = style->animations(); if (t) { for (size_t i = 0; i < t->size(); ++i) { - double iterationCount = t->animation(i)->iterationCount(); + double iterationCount = t->animation(i).iterationCount(); if (iterationCount == Animation::IterationCountInfinite) - list->append(cssValuePool().createIdentifierValue(CSSValueInfinite)); + list->append(cssValuePool.createIdentifierValue(CSSValueInfinite)); else - list->append(cssValuePool().createValue(iterationCount, CSSPrimitiveValue::CSS_NUMBER)); + list->append(cssValuePool.createValue(iterationCount, CSSPrimitiveValue::CSS_NUMBER)); } } else - list->append(cssValuePool().createValue(Animation::initialAnimationIterationCount(), CSSPrimitiveValue::CSS_NUMBER)); - return list.release(); + list->append(cssValuePool.createValue(Animation::initialIterationCount(), CSSPrimitiveValue::CSS_NUMBER)); + return list; } + case CSSPropertyAnimationName: case CSSPropertyWebkitAnimationName: { RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); const AnimationList* t = style->animations(); if (t) { for (size_t i = 0; i < t->size(); ++i) - list->append(cssValuePool().createValue(t->animation(i)->name(), CSSPrimitiveValue::CSS_STRING)); + list->append(cssValuePool.createValue(t->animation(i).name(), CSSPrimitiveValue::CSS_STRING)); } else - list->append(cssValuePool().createIdentifierValue(CSSValueNone)); - return list.release(); + list->append(cssValuePool.createIdentifierValue(CSSValueNone)); + return list; } + case CSSPropertyAnimationPlayState: case CSSPropertyWebkitAnimationPlayState: { RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); const AnimationList* t = style->animations(); if (t) { for (size_t i = 0; i < t->size(); ++i) { - int prop = t->animation(i)->playState(); + int prop = t->animation(i).playState(); if (prop == AnimPlayStatePlaying) - list->append(cssValuePool().createIdentifierValue(CSSValueRunning)); + list->append(cssValuePool.createIdentifierValue(CSSValueRunning)); else - list->append(cssValuePool().createIdentifierValue(CSSValuePaused)); + list->append(cssValuePool.createIdentifierValue(CSSValuePaused)); } } else - list->append(cssValuePool().createIdentifierValue(CSSValueRunning)); - return list.release(); + list->append(cssValuePool.createIdentifierValue(CSSValueRunning)); + return list; } + case CSSPropertyAnimationTimingFunction: case CSSPropertyWebkitAnimationTimingFunction: return getTimingFunctionValue(style->animations()); +#if ENABLE(CSS_ANIMATIONS_LEVEL_2) + case CSSPropertyWebkitAnimationTrigger: + return getAnimationTriggerValue(style->animations(), *style); +#endif case CSSPropertyWebkitAppearance: - return cssValuePool().createValue(style->appearance()); + return cssValuePool.createValue(style->appearance()); case CSSPropertyWebkitAspectRatio: - if (!style->hasAspectRatio()) - return cssValuePool().createIdentifierValue(CSSValueNone); + if (style->aspectRatioType() == AspectRatioAuto) + return cssValuePool.createIdentifierValue(CSSValueAuto); + if (style->aspectRatioType() == AspectRatioFromDimensions) + return cssValuePool.createIdentifierValue(CSSValueFromDimensions); + if (style->aspectRatioType() == AspectRatioFromIntrinsic) + return cssValuePool.createIdentifierValue(CSSValueFromIntrinsic); return CSSAspectRatioValue::create(style->aspectRatioNumerator(), style->aspectRatioDenominator()); case CSSPropertyWebkitBackfaceVisibility: - return cssValuePool().createIdentifierValue((style->backfaceVisibility() == BackfaceVisibilityHidden) ? CSSValueHidden : CSSValueVisible); + return cssValuePool.createIdentifierValue((style->backfaceVisibility() == BackfaceVisibilityHidden) ? CSSValueHidden : CSSValueVisible); case CSSPropertyWebkitBorderImage: return valueForNinePieceImage(style->borderImage()); case CSSPropertyBorderImageOutset: @@ -2549,98 +3400,108 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert case CSSPropertyWebkitMaskBoxImageSource: if (style->maskBoxImageSource()) return style->maskBoxImageSource()->cssValue(); - return cssValuePool().createIdentifierValue(CSSValueNone); + return cssValuePool.createIdentifierValue(CSSValueNone); case CSSPropertyWebkitFontSizeDelta: // Not a real style property -- used by the editing engine -- so has no computed value. break; + case CSSPropertyWebkitInitialLetter: { + RefPtr<CSSPrimitiveValue> drop = !style->initialLetterDrop() ? cssValuePool.createIdentifierValue(CSSValueNormal) : cssValuePool.createValue(style->initialLetterDrop(), CSSPrimitiveValue::CSS_NUMBER); + RefPtr<CSSPrimitiveValue> size = !style->initialLetterHeight() ? cssValuePool.createIdentifierValue(CSSValueNormal) : cssValuePool.createValue(style->initialLetterHeight(), CSSPrimitiveValue::CSS_NUMBER); + return cssValuePool.createValue(Pair::create(drop.release(), size.release())); + } case CSSPropertyWebkitMarginBottomCollapse: case CSSPropertyWebkitMarginAfterCollapse: - return cssValuePool().createValue(style->marginAfterCollapse()); + return cssValuePool.createValue(style->marginAfterCollapse()); case CSSPropertyWebkitMarginTopCollapse: case CSSPropertyWebkitMarginBeforeCollapse: - return cssValuePool().createValue(style->marginBeforeCollapse()); + return cssValuePool.createValue(style->marginBeforeCollapse()); #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) case CSSPropertyWebkitOverflowScrolling: if (!style->useTouchOverflowScrolling()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - return cssValuePool().createIdentifierValue(CSSValueTouch); + return cssValuePool.createIdentifierValue(CSSValueAuto); + return cssValuePool.createIdentifierValue(CSSValueTouch); #endif - case CSSPropertyWebkitPerspective: + case CSSPropertyPerspective: if (!style->hasPerspective()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return zoomAdjustedPixelValue(style->perspective(), style.get()); - case CSSPropertyWebkitPerspectiveOrigin: { + return cssValuePool.createIdentifierValue(CSSValueNone); + return zoomAdjustedPixelValue(style->perspective(), *style); + case CSSPropertyPerspectiveOrigin: { RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); if (renderer) { LayoutRect box; - if (renderer->isBox()) - box = toRenderBox(renderer)->borderBoxRect(); + if (is<RenderBox>(*renderer)) + box = downcast<RenderBox>(*renderer).borderBoxRect(); - RenderView* renderView = m_node->document()->renderView(); - list->append(zoomAdjustedPixelValue(minimumValueForLength(style->perspectiveOriginX(), box.width(), renderView), style.get())); - list->append(zoomAdjustedPixelValue(minimumValueForLength(style->perspectiveOriginY(), box.height(), renderView), style.get())); + list->append(zoomAdjustedPixelValue(minimumValueForLength(style->perspectiveOriginX(), box.width()), *style)); + list->append(zoomAdjustedPixelValue(minimumValueForLength(style->perspectiveOriginY(), box.height()), *style)); } else { - list->append(zoomAdjustedPixelValueForLength(style->perspectiveOriginX(), style.get())); - list->append(zoomAdjustedPixelValueForLength(style->perspectiveOriginY(), style.get())); + list->append(zoomAdjustedPixelValueForLength(style->perspectiveOriginX(), *style)); + list->append(zoomAdjustedPixelValueForLength(style->perspectiveOriginY(), *style)); } - return list.release(); + return list; } case CSSPropertyWebkitRtlOrdering: - return cssValuePool().createIdentifierValue(style->rtlOrdering() ? CSSValueVisual : CSSValueLogical); + return cssValuePool.createIdentifierValue(style->rtlOrdering() ? CSSValueVisual : CSSValueLogical); #if ENABLE(TOUCH_EVENTS) case CSSPropertyWebkitTapHighlightColor: return currentColorOrValidColor(style.get(), style->tapHighlightColor()); + case CSSPropertyTouchAction: + return cssValuePool.createValue(style->touchAction()); +#endif +#if PLATFORM(IOS) + case CSSPropertyWebkitTouchCallout: + return cssValuePool.createIdentifierValue(style->touchCalloutEnabled() ? CSSValueDefault : CSSValueNone); #endif case CSSPropertyWebkitUserDrag: - return cssValuePool().createValue(style->userDrag()); + return cssValuePool.createValue(style->userDrag()); case CSSPropertyWebkitUserSelect: - return cssValuePool().createValue(style->userSelect()); + return cssValuePool.createValue(style->userSelect()); case CSSPropertyBorderBottomLeftRadius: - return getBorderRadiusCornerValue(style->borderBottomLeftRadius(), style.get(), m_node->document()->renderView()); + return getBorderRadiusCornerValue(style->borderBottomLeftRadius(), *style); case CSSPropertyBorderBottomRightRadius: - return getBorderRadiusCornerValue(style->borderBottomRightRadius(), style.get(), m_node->document()->renderView()); + return getBorderRadiusCornerValue(style->borderBottomRightRadius(), *style); case CSSPropertyBorderTopLeftRadius: - return getBorderRadiusCornerValue(style->borderTopLeftRadius(), style.get(), m_node->document()->renderView()); + return getBorderRadiusCornerValue(style->borderTopLeftRadius(), *style); case CSSPropertyBorderTopRightRadius: - return getBorderRadiusCornerValue(style->borderTopRightRadius(), style.get(), m_node->document()->renderView()); + return getBorderRadiusCornerValue(style->borderTopRightRadius(), *style); case CSSPropertyClip: { if (!style->hasClip()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - RefPtr<Rect> rect = Rect::create(); - rect->setTop(zoomAdjustedPixelValue(style->clip().top().value(), style.get())); - rect->setRight(zoomAdjustedPixelValue(style->clip().right().value(), style.get())); - rect->setBottom(zoomAdjustedPixelValue(style->clip().bottom().value(), style.get())); - rect->setLeft(zoomAdjustedPixelValue(style->clip().left().value(), style.get())); - return cssValuePool().createValue(rect.release()); + return cssValuePool.createIdentifierValue(CSSValueAuto); + auto rect = Rect::create(); + rect->setTop(autoOrZoomAdjustedValue(style->clip().top(), *style)); + rect->setRight(autoOrZoomAdjustedValue(style->clip().right(), *style)); + rect->setBottom(autoOrZoomAdjustedValue(style->clip().bottom(), *style)); + rect->setLeft(autoOrZoomAdjustedValue(style->clip().left(), *style)); + return cssValuePool.createValue(WTFMove(rect)); } case CSSPropertySpeak: - return cssValuePool().createValue(style->speak()); - case CSSPropertyWebkitTransform: - return computedTransform(renderer, style.get()); - case CSSPropertyWebkitTransformOrigin: { + return cssValuePool.createValue(style->speak()); + case CSSPropertyTransform: + return computedTransform(renderer, *style); + case CSSPropertyTransformOrigin: { RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); if (renderer) { LayoutRect box; - if (renderer->isBox()) - box = toRenderBox(renderer)->borderBoxRect(); + if (is<RenderBox>(*renderer)) + box = downcast<RenderBox>(*renderer).borderBoxRect(); - RenderView* renderView = m_node->document()->renderView(); - list->append(zoomAdjustedPixelValue(minimumValueForLength(style->transformOriginX(), box.width(), renderView), style.get())); - list->append(zoomAdjustedPixelValue(minimumValueForLength(style->transformOriginY(), box.height(), renderView), style.get())); + list->append(zoomAdjustedPixelValue(minimumValueForLength(style->transformOriginX(), box.width()), *style)); + list->append(zoomAdjustedPixelValue(minimumValueForLength(style->transformOriginY(), box.height()), *style)); if (style->transformOriginZ() != 0) - list->append(zoomAdjustedPixelValue(style->transformOriginZ(), style.get())); + list->append(zoomAdjustedPixelValue(style->transformOriginZ(), *style)); } else { - list->append(zoomAdjustedPixelValueForLength(style->transformOriginX(), style.get())); - list->append(zoomAdjustedPixelValueForLength(style->transformOriginY(), style.get())); + list->append(zoomAdjustedPixelValueForLength(style->transformOriginX(), *style)); + list->append(zoomAdjustedPixelValueForLength(style->transformOriginY(), *style)); if (style->transformOriginZ() != 0) - list->append(zoomAdjustedPixelValue(style->transformOriginZ(), style.get())); + list->append(zoomAdjustedPixelValue(style->transformOriginZ(), *style)); } - return list.release(); + return list; } + case CSSPropertyTransformStyle: case CSSPropertyWebkitTransformStyle: - return cssValuePool().createIdentifierValue((style->transformStyle3D() == TransformStyle3DPreserve3D) ? CSSValuePreserve3d : CSSValueFlat); + return cssValuePool.createIdentifierValue((style->transformStyle3D() == TransformStyle3DPreserve3D) ? CSSValuePreserve3d : CSSValueFlat); case CSSPropertyTransitionDelay: case CSSPropertyWebkitTransitionDelay: return getDelayValue(style->transitions()); @@ -2660,124 +3521,111 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert RefPtr<CSSValueList> transitionsList = CSSValueList::createCommaSeparated(); for (size_t i = 0; i < animList->size(); ++i) { RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); - const Animation* animation = animList->animation(i); + const Animation& animation = animList->animation(i); list->append(createTransitionPropertyValue(animation)); - list->append(cssValuePool().createValue(animation->duration(), CSSPrimitiveValue::CSS_S)); - list->append(createTimingFunctionValue(animation->timingFunction().get())); - list->append(cssValuePool().createValue(animation->delay(), CSSPrimitiveValue::CSS_S)); - transitionsList->append(list); + list->append(cssValuePool.createValue(animation.duration(), CSSPrimitiveValue::CSS_S)); + list->append(createTimingFunctionValue(animation.timingFunction().get())); + list->append(cssValuePool.createValue(animation.delay(), CSSPrimitiveValue::CSS_S)); + transitionsList->append(list.releaseNonNull()); } - return transitionsList.release(); + return transitionsList; } RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); // transition-property default value. - list->append(cssValuePool().createIdentifierValue(CSSValueAll)); - list->append(cssValuePool().createValue(Animation::initialAnimationDuration(), CSSPrimitiveValue::CSS_S)); - list->append(createTimingFunctionValue(Animation::initialAnimationTimingFunction().get())); - list->append(cssValuePool().createValue(Animation::initialAnimationDelay(), CSSPrimitiveValue::CSS_S)); - return list.release(); + list->append(cssValuePool.createIdentifierValue(CSSValueAll)); + list->append(cssValuePool.createValue(Animation::initialDuration(), CSSPrimitiveValue::CSS_S)); + list->append(createTimingFunctionValue(Animation::initialTimingFunction().get())); + list->append(cssValuePool.createValue(Animation::initialDelay(), CSSPrimitiveValue::CSS_S)); + return list; } case CSSPropertyPointerEvents: - return cssValuePool().createValue(style->pointerEvents()); - case CSSPropertyWebkitColorCorrection: - return cssValuePool().createValue(style->colorSpace()); + return cssValuePool.createValue(style->pointerEvents()); case CSSPropertyWebkitLineGrid: if (style->lineGrid().isNull()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return cssValuePool().createValue(style->lineGrid(), CSSPrimitiveValue::CSS_STRING); + return cssValuePool.createIdentifierValue(CSSValueNone); + return cssValuePool.createValue(style->lineGrid(), CSSPrimitiveValue::CSS_STRING); case CSSPropertyWebkitLineSnap: return CSSPrimitiveValue::create(style->lineSnap()); case CSSPropertyWebkitLineAlign: return CSSPrimitiveValue::create(style->lineAlign()); case CSSPropertyWebkitWritingMode: - return cssValuePool().createValue(style->writingMode()); + return cssValuePool.createValue(style->writingMode()); case CSSPropertyWebkitTextCombine: - return cssValuePool().createValue(style->textCombine()); + return cssValuePool.createValue(style->textCombine()); case CSSPropertyWebkitTextOrientation: return CSSPrimitiveValue::create(style->textOrientation()); case CSSPropertyWebkitLineBoxContain: return createLineBoxContainValue(style->lineBoxContain()); + case CSSPropertyAlt: + return altTextToCSSValue(style.get()); case CSSPropertyContent: return contentToCSSValue(style.get()); case CSSPropertyCounterIncrement: return counterToCSSValue(style.get(), propertyID); case CSSPropertyCounterReset: return counterToCSSValue(style.get(), propertyID); - case CSSPropertyWebkitClipPath: - if (ClipPathOperation* operation = style->clipPath()) { - if (operation->getOperationType() == ClipPathOperation::SHAPE) - return valueForBasicShape(static_cast<ShapeClipPathOperation*>(operation)->basicShape()); -#if ENABLE(SVG) - else if (operation->getOperationType() == ClipPathOperation::REFERENCE) { - ReferenceClipPathOperation* referenceOperation = static_cast<ReferenceClipPathOperation*>(operation); - return CSSPrimitiveValue::create(referenceOperation->url(), CSSPrimitiveValue::CSS_URI); - } -#endif + case CSSPropertyWebkitClipPath: { + ClipPathOperation* operation = style->clipPath(); + if (!operation) + return cssValuePool.createIdentifierValue(CSSValueNone); + if (is<ReferenceClipPathOperation>(*operation)) { + const auto& referenceOperation = downcast<ReferenceClipPathOperation>(*operation); + return CSSPrimitiveValue::create(referenceOperation.url(), CSSPrimitiveValue::CSS_URI); } - return cssValuePool().createIdentifierValue(CSSValueNone); + RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); + if (is<ShapeClipPathOperation>(*operation)) { + const auto& shapeOperation = downcast<ShapeClipPathOperation>(*operation); + list->append(valueForBasicShape(*style, shapeOperation.basicShape())); + if (shapeOperation.referenceBox() != BoxMissing) + list->append(cssValuePool.createValue(shapeOperation.referenceBox())); + } + if (is<BoxClipPathOperation>(*operation)) { + const auto& boxOperation = downcast<BoxClipPathOperation>(*operation); + list->append(cssValuePool.createValue(boxOperation.referenceBox())); + } + return list; + } #if ENABLE(CSS_REGIONS) case CSSPropertyWebkitFlowInto: - if (style->flowThread().isNull()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return cssValuePool().createValue(style->flowThread(), CSSPrimitiveValue::CSS_STRING); + if (!style->hasFlowInto()) + return cssValuePool.createIdentifierValue(CSSValueNone); + return cssValuePool.createValue(style->flowThread(), CSSPrimitiveValue::CSS_STRING); case CSSPropertyWebkitFlowFrom: - if (style->regionThread().isNull()) - return cssValuePool().createIdentifierValue(CSSValueNone); - return cssValuePool().createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING); + if (!style->hasFlowFrom()) + return cssValuePool.createIdentifierValue(CSSValueNone); + return cssValuePool.createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING); case CSSPropertyWebkitRegionFragment: - return cssValuePool().createValue(style->regionFragment()); -#endif -#if ENABLE(CSS_EXCLUSIONS) - case CSSPropertyWebkitWrapFlow: - return cssValuePool().createValue(style->wrapFlow()); - case CSSPropertyWebkitWrapThrough: - return cssValuePool().createValue(style->wrapThrough()); + return cssValuePool.createValue(style->regionFragment()); #endif #if ENABLE(CSS_SHAPES) case CSSPropertyWebkitShapeMargin: - return cssValuePool().createValue(style->shapeMargin()); - case CSSPropertyWebkitShapePadding: - return cssValuePool().createValue(style->shapePadding()); - case CSSPropertyWebkitShapeInside: - if (!style->shapeInside()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - if (style->shapeInside()->type() == ShapeValue::Outside) - return cssValuePool().createIdentifierValue(CSSValueOutsideShape); - if (style->shapeInside()->type() == ShapeValue::Image) { - if (style->shapeInside()->image()) - return style->shapeInside()->image()->cssValue(); - return cssValuePool().createIdentifierValue(CSSValueNone); - } - ASSERT(style->shapeInside()->type() == ShapeValue::Shape); - return valueForBasicShape(style->shapeInside()->shape()); + return cssValuePool.createValue(style->shapeMargin(), *style); + case CSSPropertyWebkitShapeImageThreshold: + return cssValuePool.createValue(style->shapeImageThreshold(), CSSPrimitiveValue::CSS_NUMBER); case CSSPropertyWebkitShapeOutside: - if (!style->shapeOutside()) - return cssValuePool().createIdentifierValue(CSSValueAuto); - if (style->shapeOutside()->type() == ShapeValue::Image) { - if (style->shapeOutside()->image()) - return style->shapeOutside()->image()->cssValue(); - return cssValuePool().createIdentifierValue(CSSValueNone); - } - ASSERT(style->shapeOutside()->type() == ShapeValue::Shape); - return valueForBasicShape(style->shapeOutside()->shape()); + return shapePropertyValue(*style, style->shapeOutside()); #endif -#if ENABLE(CSS_FILTERS) - case CSSPropertyWebkitFilter: - return valueForFilter(renderer, style.get()); + case CSSPropertyFilter: + return valueForFilter(*style, style->filter()); +#if ENABLE(FILTERS_LEVEL_2) + case CSSPropertyWebkitBackdropFilter: + return valueForFilter(*style, style->backdropFilter()); #endif #if ENABLE(CSS_COMPOSITING) - case CSSPropertyWebkitBlendMode: - return cssValuePool().createValue(style->blendMode()); + case CSSPropertyMixBlendMode: + return cssValuePool.createValue(style->blendMode()); + case CSSPropertyIsolation: + return cssValuePool.createValue(style->isolation()); #endif - case CSSPropertyWebkitBackgroundBlendMode: { + case CSSPropertyBackgroundBlendMode: { const FillLayer* layers = style->backgroundLayers(); if (!layers->next()) - return cssValuePool().createValue(layers->blendMode()); + return cssValuePool.createValue(layers->blendMode()); RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated(); for (const FillLayer* currLayer = layers; currLayer; currLayer = currLayer->next()) - list->append(cssValuePool().createValue(currLayer->blendMode())); + list->append(cssValuePool.createValue(currLayer->blendMode())); return list.release(); } @@ -2785,13 +3633,12 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert return getBackgroundShorthandValue(); case CSSPropertyBorder: { RefPtr<CSSValue> value = propertyValue(CSSPropertyBorderTop, DoNotUpdateLayout); - const CSSPropertyID properties[3] = { CSSPropertyBorderRight, CSSPropertyBorderBottom, - CSSPropertyBorderLeft }; - for (size_t i = 0; i < WTF_ARRAY_LENGTH(properties); ++i) { - if (!compareCSSValuePtr<CSSValue>(value, propertyValue(properties[i], DoNotUpdateLayout))) - return 0; + const CSSPropertyID properties[3] = { CSSPropertyBorderRight, CSSPropertyBorderBottom, CSSPropertyBorderLeft }; + for (auto& property : properties) { + if (!compareCSSValuePtr<CSSValue>(value, propertyValue(property, DoNotUpdateLayout))) + return nullptr; } - return value.release(); + return value; } case CSSPropertyBorderBottom: return getCSSPropertyValuesForShorthandProperties(borderBottomShorthand()); @@ -2802,7 +3649,7 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert case CSSPropertyBorderImage: return valueForNinePieceImage(style->borderImage()); case CSSPropertyBorderRadius: - return getBorderRadiusShorthandValue(style.get(), m_node->document()->renderView()); + return getBorderRadiusShorthandValue(*style); case CSSPropertyBorderRight: return getCSSPropertyValuesForShorthandProperties(borderRightShorthand()); case CSSPropertyBorderStyle: @@ -2811,10 +3658,10 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert return getCSSPropertyValuesForShorthandProperties(borderTopShorthand()); case CSSPropertyBorderWidth: return getCSSPropertyValuesForSidesShorthand(borderWidthShorthand()); - case CSSPropertyWebkitColumnRule: - return getCSSPropertyValuesForShorthandProperties(webkitColumnRuleShorthand()); - case CSSPropertyWebkitColumns: - return getCSSPropertyValuesForShorthandProperties(webkitColumnsShorthand()); + case CSSPropertyColumnRule: + return getCSSPropertyValuesForShorthandProperties(columnRuleShorthand()); + case CSSPropertyColumns: + return getCSSPropertyValuesForShorthandProperties(columnsShorthand()); case CSSPropertyListStyle: return getCSSPropertyValuesForShorthandProperties(listStyleShorthand()); case CSSPropertyMargin: @@ -2823,12 +3670,55 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert return getCSSPropertyValuesForShorthandProperties(outlineShorthand()); case CSSPropertyPadding: return getCSSPropertyValuesForSidesShorthand(paddingShorthand()); + +#if ENABLE(CSS_SCROLL_SNAP) + case CSSPropertyWebkitScrollSnapType: + return cssValuePool.createValue(style->scrollSnapType()); + case CSSPropertyWebkitScrollSnapDestination: + return scrollSnapDestination(*style, style->scrollSnapDestination()); + case CSSPropertyWebkitScrollSnapPointsX: + return scrollSnapPoints(*style, style->scrollSnapPointsX()); + case CSSPropertyWebkitScrollSnapPointsY: + return scrollSnapPoints(*style, style->scrollSnapPointsY()); + case CSSPropertyWebkitScrollSnapCoordinate: + return scrollSnapCoordinates(*style, style->scrollSnapCoordinates()); +#endif + +#if ENABLE(CSS_TRAILING_WORD) + case CSSPropertyAppleTrailingWord: + return cssValuePool.createValue(style->trailingWord()); +#endif + /* Individual properties not part of the spec */ case CSSPropertyBackgroundRepeatX: case CSSPropertyBackgroundRepeatY: break; + // Length properties for SVG. + case CSSPropertyCx: + return zoomAdjustedPixelValueForLength(style->svgStyle().cx(), *style); + case CSSPropertyCy: + return zoomAdjustedPixelValueForLength(style->svgStyle().cy(), *style); + case CSSPropertyR: + return zoomAdjustedPixelValueForLength(style->svgStyle().r(), *style); + case CSSPropertyRx: + return zoomAdjustedPixelValueForLength(style->svgStyle().rx(), *style); + case CSSPropertyRy: + return zoomAdjustedPixelValueForLength(style->svgStyle().ry(), *style); + case CSSPropertyStrokeWidth: + return zoomAdjustedPixelValueForLength(style->svgStyle().strokeWidth(), *style); + case CSSPropertyStrokeDashoffset: + return zoomAdjustedPixelValueForLength(style->svgStyle().strokeDashOffset(), *style); + case CSSPropertyX: + return zoomAdjustedPixelValueForLength(style->svgStyle().x(), *style); + case CSSPropertyY: + return zoomAdjustedPixelValueForLength(style->svgStyle().y(), *style); + case CSSPropertyWebkitTextZoom: + return cssValuePool.createValue(style->textZoom()); + /* Unimplemented CSS 3 properties (including CSS3 shorthand properties) */ + case CSSPropertyAll: + case CSSPropertyAnimation: case CSSPropertyWebkitTextEmphasis: case CSSPropertyTextLineThrough: case CSSPropertyTextLineThroughColor: @@ -2888,9 +3778,6 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert break; /* Other unimplemented properties */ -#if ENABLE(CSS_SHADERS) - case CSSPropertyGeometry: -#endif case CSSPropertyPage: // for @page case CSSPropertyQuotes: // FIXME: needs implementation case CSSPropertySize: // for @page @@ -2905,16 +3792,12 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert case CSSPropertyWebkitMask: case CSSPropertyWebkitMaskRepeatX: case CSSPropertyWebkitMaskRepeatY: - case CSSPropertyWebkitPerspectiveOriginX: - case CSSPropertyWebkitPerspectiveOriginY: + case CSSPropertyPerspectiveOriginX: + case CSSPropertyPerspectiveOriginY: case CSSPropertyWebkitTextStroke: - case CSSPropertyWebkitTransformOriginX: - case CSSPropertyWebkitTransformOriginY: - case CSSPropertyWebkitTransformOriginZ: -#if ENABLE(CSS_SHADERS) - case CSSPropertyMix: - case CSSPropertyParameters: -#endif + case CSSPropertyTransformOriginX: + case CSSPropertyTransformOriginY: + case CSSPropertyTransformOriginZ: break; #if ENABLE(CSS_DEVICE_ADAPTATION) @@ -2925,13 +3808,11 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert break; #endif -#if ENABLE(SVG) case CSSPropertyBufferedRendering: case CSSPropertyClipPath: case CSSPropertyClipRule: case CSSPropertyMask: case CSSPropertyEnableBackground: - case CSSPropertyFilter: case CSSPropertyFloodColor: case CSSPropertyFloodOpacity: case CSSPropertyLightingColor: @@ -2949,15 +3830,14 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert case CSSPropertyMarkerMid: case CSSPropertyMarkerStart: case CSSPropertyMaskType: + case CSSPropertyPaintOrder: case CSSPropertyShapeRendering: case CSSPropertyStroke: case CSSPropertyStrokeDasharray: - case CSSPropertyStrokeDashoffset: case CSSPropertyStrokeLinecap: case CSSPropertyStrokeLinejoin: case CSSPropertyStrokeMiterlimit: case CSSPropertyStrokeOpacity: - case CSSPropertyStrokeWidth: case CSSPropertyAlignmentBaseline: case CSSPropertyBaselineShift: case CSSPropertyDominantBaseline: @@ -2969,19 +3849,21 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert case CSSPropertyWritingMode: case CSSPropertyWebkitSvgShadow: return svgPropertyValue(propertyID, DoNotUpdateLayout); -#endif + case CSSPropertyCustom: + ASSERT_NOT_REACHED(); + return nullptr; } logUnimplementedPropertyID(propertyID); - return 0; + return nullptr; } String CSSComputedStyleDeclaration::getPropertyValue(CSSPropertyID propertyID) const { RefPtr<CSSValue> value = getPropertyCSSValue(propertyID); - if (value) - return value->cssText(); - return ""; + if (!value) + return emptyString(); // FIXME: Should this be null instead, as it is in StyleProperties::getPropertyValue? + return value->cssText(); } unsigned CSSComputedStyleDeclaration::length() const @@ -2994,49 +3876,68 @@ unsigned CSSComputedStyleDeclaration::length() const if (!style) return 0; - return numComputedProperties; + return numComputedProperties + style->customProperties().size(); } String CSSComputedStyleDeclaration::item(unsigned i) const { if (i >= length()) - return ""; + return emptyString(); + + if (i < numComputedProperties) + return getPropertyNameString(computedProperties[i]); + + Node* node = m_node.get(); + if (!node) + return emptyString(); - return getPropertyNameString(computedProperties[i]); + RenderStyle* style = node->computedStyle(m_pseudoElementSpecifier); + if (!style) + return emptyString(); + + unsigned index = i - numComputedProperties; + + const auto& customProperties = style->customProperties(); + if (index >= customProperties.size()) + return emptyString(); + + Vector<String, 4> results; + copyKeysToVector(customProperties, results); + return results.at(index); } bool ComputedStyleExtractor::propertyMatches(CSSPropertyID propertyID, const CSSValue* value) const { - if (propertyID == CSSPropertyFontSize && value->isPrimitiveValue() && m_node) { - m_node->document()->updateLayoutIgnorePendingStylesheets(); - RenderStyle* style = m_node->computedStyle(m_pseudoElementSpecifier); - if (style && style->fontDescription().keywordSize()) { - CSSValueID sizeValue = cssIdentifierForFontSizeKeyword(style->fontDescription().keywordSize()); - const CSSPrimitiveValue* primitiveValue = static_cast<const CSSPrimitiveValue*>(value); - if (primitiveValue->isValueID() && primitiveValue->getValueID() == sizeValue) - return true; + if (propertyID == CSSPropertyFontSize && is<CSSPrimitiveValue>(*value) && m_node) { + m_node->document().updateLayoutIgnorePendingStylesheets(); + if (RenderStyle* style = m_node->computedStyle(m_pseudoElementSpecifier)) { + if (CSSValueID sizeIdentifier = style->fontDescription().keywordSizeAsIdentifier()) { + auto& primitiveValue = downcast<CSSPrimitiveValue>(*value); + if (primitiveValue.isValueID() && primitiveValue.getValueID() == sizeIdentifier) + return true; + } } } RefPtr<CSSValue> computedValue = propertyValue(propertyID); return computedValue && value && computedValue->equals(*value); } -PassRefPtr<MutableStylePropertySet> ComputedStyleExtractor::copyProperties() const +Ref<MutableStyleProperties> ComputedStyleExtractor::copyProperties() const { return copyPropertiesInSet(computedProperties, numComputedProperties); } -PassRefPtr<CSSValueList> ComputedStyleExtractor::getCSSPropertyValuesForShorthandProperties(const StylePropertyShorthand& shorthand) const +RefPtr<CSSValueList> ComputedStyleExtractor::getCSSPropertyValuesForShorthandProperties(const StylePropertyShorthand& shorthand) const { RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); for (size_t i = 0; i < shorthand.length(); ++i) { RefPtr<CSSValue> value = propertyValue(shorthand.properties()[i], DoNotUpdateLayout); - list->append(value); + list->append(value.releaseNonNull()); } - return list.release(); + return list; } -PassRefPtr<CSSValueList> ComputedStyleExtractor::getCSSPropertyValuesForSidesShorthand(const StylePropertyShorthand& shorthand) const +RefPtr<CSSValueList> ComputedStyleExtractor::getCSSPropertyValuesForSidesShorthand(const StylePropertyShorthand& shorthand) const { RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); // Assume the properties are in the usual order top, right, bottom, left. @@ -3047,34 +3948,34 @@ PassRefPtr<CSSValueList> ComputedStyleExtractor::getCSSPropertyValuesForSidesSho // All 4 properties must be specified. if (!topValue || !rightValue || !bottomValue || !leftValue) - return 0; + return nullptr; bool showLeft = !compareCSSValuePtr(rightValue, leftValue); bool showBottom = !compareCSSValuePtr(topValue, bottomValue) || showLeft; bool showRight = !compareCSSValuePtr(topValue, rightValue) || showBottom; - list->append(topValue.release()); + list->append(topValue.releaseNonNull()); if (showRight) - list->append(rightValue.release()); + list->append(rightValue.releaseNonNull()); if (showBottom) - list->append(bottomValue.release()); + list->append(bottomValue.releaseNonNull()); if (showLeft) - list->append(leftValue.release()); + list->append(leftValue.releaseNonNull()); - return list.release(); + return list; } -PassRefPtr<CSSValueList> ComputedStyleExtractor::getCSSPropertyValuesForGridShorthand(const StylePropertyShorthand& shorthand) const +RefPtr<CSSValueList> ComputedStyleExtractor::getCSSPropertyValuesForGridShorthand(const StylePropertyShorthand& shorthand) const { RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); for (size_t i = 0; i < shorthand.length(); ++i) { RefPtr<CSSValue> value = propertyValue(shorthand.properties()[i], DoNotUpdateLayout); - list->append(value.release()); + list->append(value.releaseNonNull()); } - return list.release(); + return list; } -PassRefPtr<MutableStylePropertySet> ComputedStyleExtractor::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const +Ref<MutableStyleProperties> ComputedStyleExtractor::copyPropertiesInSet(const CSSPropertyID* set, unsigned length) const { Vector<CSSProperty, 256> list; list.reserveInitialCapacity(length); @@ -3083,25 +3984,31 @@ PassRefPtr<MutableStylePropertySet> ComputedStyleExtractor::copyPropertiesInSet( if (value) list.append(CSSProperty(set[i], value.release(), false)); } - return MutableStylePropertySet::create(list.data(), list.size()); + return MutableStyleProperties::create(list.data(), list.size()); } CSSRule* CSSComputedStyleDeclaration::parentRule() const { - return 0; + return nullptr; } -PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(const String& propertyName) +RefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(const String& propertyName) { + if (isCustomPropertyName(propertyName)) + return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).customPropertyValue(propertyName); + CSSPropertyID propertyID = cssPropertyID(propertyName); if (!propertyID) - return 0; + return nullptr; RefPtr<CSSValue> value = getPropertyCSSValue(propertyID); - return value ? value->cloneForCSSOM() : 0; + return value ? value->cloneForCSSOM() : nullptr; } String CSSComputedStyleDeclaration::getPropertyValue(const String &propertyName) { + if (isCustomPropertyName(propertyName)) + return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).customPropertyText(propertyName); + CSSPropertyID propertyID = cssPropertyID(propertyName); if (!propertyID) return String(); @@ -3111,12 +4018,12 @@ String CSSComputedStyleDeclaration::getPropertyValue(const String &propertyName) String CSSComputedStyleDeclaration::getPropertyPriority(const String&) { // All computed styles have a priority of not "important". - return ""; + return emptyString(); // FIXME: Should this sometimes be null instead of empty, to match a normal style declaration? } String CSSComputedStyleDeclaration::getPropertyShorthand(const String&) { - return ""; + return emptyString(); // FIXME: Should this sometimes be null instead of empty, to match a normal style declaration? } bool CSSComputedStyleDeclaration::isPropertyImplicit(const String&) @@ -3135,7 +4042,7 @@ String CSSComputedStyleDeclaration::removeProperty(const String&, ExceptionCode& return String(); } -PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID) +RefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValueInternal(CSSPropertyID propertyID) { return getPropertyCSSValue(propertyID); } @@ -3145,12 +4052,13 @@ String CSSComputedStyleDeclaration::getPropertyValueInternal(CSSPropertyID prope return getPropertyValue(propertyID); } -void CSSComputedStyleDeclaration::setPropertyInternal(CSSPropertyID, const String&, bool, ExceptionCode& ec) +bool CSSComputedStyleDeclaration::setPropertyInternal(CSSPropertyID, const String&, bool, ExceptionCode& ec) { ec = NO_MODIFICATION_ALLOWED_ERR; + return false; } -PassRefPtr<CSSValueList> ComputedStyleExtractor::getBackgroundShorthandValue() const +RefPtr<CSSValueList> ComputedStyleExtractor::getBackgroundShorthandValue() const { static const CSSPropertyID propertiesBeforeSlashSeperator[5] = { CSSPropertyBackgroundColor, CSSPropertyBackgroundImage, CSSPropertyBackgroundRepeat, CSSPropertyBackgroundAttachment, @@ -3159,9 +4067,9 @@ PassRefPtr<CSSValueList> ComputedStyleExtractor::getBackgroundShorthandValue() c CSSPropertyBackgroundClip }; RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); - list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShorthand(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperator)))); - list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShorthand(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator)))); - return list.release(); + list->append(*getCSSPropertyValuesForShorthandProperties(StylePropertyShorthand(CSSPropertyBackground, propertiesBeforeSlashSeperator))); + list->append(*getCSSPropertyValuesForShorthandProperties(StylePropertyShorthand(CSSPropertyBackground, propertiesAfterSlashSeperator))); + return list; } } // namespace WebCore |