| Index: Source/core/css/resolver/CSSToStyleMap.cpp
|
| diff --git a/Source/core/css/resolver/CSSToStyleMap.cpp b/Source/core/css/resolver/CSSToStyleMap.cpp
|
| index 2b7c2ae257b06c6cd28bcdde380c3c9777f77a70..5aa6d2059b9b470ed5df176629c4234d4bb4b5cc 100644
|
| --- a/Source/core/css/resolver/CSSToStyleMap.cpp
|
| +++ b/Source/core/css/resolver/CSSToStyleMap.cpp
|
| @@ -43,7 +43,7 @@
|
|
|
| namespace blink {
|
|
|
| -void CSSToStyleMap::mapFillAttachment(StyleResolverState&, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillAttachment(StyleResolverState&, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setAttachment(FillLayer::initialFillAttachment(layer->type()));
|
| @@ -69,7 +69,7 @@ void CSSToStyleMap::mapFillAttachment(StyleResolverState&, FillLayer* layer, CSS
|
| }
|
| }
|
|
|
| -void CSSToStyleMap::mapFillClip(StyleResolverState&, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillClip(StyleResolverState&, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setClip(FillLayer::initialFillClip(layer->type()));
|
| @@ -83,7 +83,7 @@ void CSSToStyleMap::mapFillClip(StyleResolverState&, FillLayer* layer, CSSValue
|
| layer->setClip(primitiveValue);
|
| }
|
|
|
| -void CSSToStyleMap::mapFillComposite(StyleResolverState&, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillComposite(StyleResolverState&, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setComposite(FillLayer::initialFillComposite(layer->type()));
|
| @@ -97,7 +97,7 @@ void CSSToStyleMap::mapFillComposite(StyleResolverState&, FillLayer* layer, CSSV
|
| layer->setComposite(primitiveValue);
|
| }
|
|
|
| -void CSSToStyleMap::mapFillBlendMode(StyleResolverState&, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillBlendMode(StyleResolverState&, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setBlendMode(FillLayer::initialFillBlendMode(layer->type()));
|
| @@ -111,7 +111,7 @@ void CSSToStyleMap::mapFillBlendMode(StyleResolverState&, FillLayer* layer, CSSV
|
| layer->setBlendMode(primitiveValue);
|
| }
|
|
|
| -void CSSToStyleMap::mapFillOrigin(StyleResolverState&, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillOrigin(StyleResolverState&, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setOrigin(FillLayer::initialFillOrigin(layer->type()));
|
| @@ -126,7 +126,7 @@ void CSSToStyleMap::mapFillOrigin(StyleResolverState&, FillLayer* layer, CSSValu
|
| }
|
|
|
|
|
| -void CSSToStyleMap::mapFillImage(StyleResolverState& state, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillImage(StyleResolverState& state, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setImage(FillLayer::initialFillImage(layer->type()));
|
| @@ -137,7 +137,7 @@ void CSSToStyleMap::mapFillImage(StyleResolverState& state, FillLayer* layer, CS
|
| layer->setImage(state.styleImage(property, value));
|
| }
|
|
|
| -void CSSToStyleMap::mapFillRepeatX(StyleResolverState&, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillRepeatX(StyleResolverState&, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setRepeatX(FillLayer::initialFillRepeatX(layer->type()));
|
| @@ -151,7 +151,7 @@ void CSSToStyleMap::mapFillRepeatX(StyleResolverState&, FillLayer* layer, CSSVal
|
| layer->setRepeatX(primitiveValue);
|
| }
|
|
|
| -void CSSToStyleMap::mapFillRepeatY(StyleResolverState&, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillRepeatY(StyleResolverState&, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setRepeatY(FillLayer::initialFillRepeatY(layer->type()));
|
| @@ -165,7 +165,7 @@ void CSSToStyleMap::mapFillRepeatY(StyleResolverState&, FillLayer* layer, CSSVal
|
| layer->setRepeatY(primitiveValue);
|
| }
|
|
|
| -void CSSToStyleMap::mapFillSize(StyleResolverState& state, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillSize(StyleResolverState& state, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setSizeType(FillLayer::initialFillSizeType(layer->type()));
|
| @@ -207,7 +207,7 @@ void CSSToStyleMap::mapFillSize(StyleResolverState& state, FillLayer* layer, CSS
|
| layer->setSizeLength(b);
|
| }
|
|
|
| -void CSSToStyleMap::mapFillXPosition(StyleResolverState& state, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillXPosition(StyleResolverState& state, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setXPosition(FillLayer::initialFillXPosition(layer->type()));
|
| @@ -229,7 +229,7 @@ void CSSToStyleMap::mapFillXPosition(StyleResolverState& state, FillLayer* layer
|
| layer->setBackgroundXOrigin(*(pair->first()));
|
| }
|
|
|
| -void CSSToStyleMap::mapFillYPosition(StyleResolverState& state, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillYPosition(StyleResolverState& state, FillLayer* layer, const CSSValue& value)
|
| {
|
| if (value.isInitialValue()) {
|
| layer->setYPosition(FillLayer::initialFillYPosition(layer->type()));
|
| @@ -251,7 +251,7 @@ void CSSToStyleMap::mapFillYPosition(StyleResolverState& state, FillLayer* layer
|
| layer->setBackgroundYOrigin(*(pair->first()));
|
| }
|
|
|
| -void CSSToStyleMap::mapFillMaskSourceType(StyleResolverState&, FillLayer* layer, CSSValue value)
|
| +void CSSToStyleMap::mapFillMaskSourceType(StyleResolverState&, FillLayer* layer, const CSSValue& value)
|
| {
|
| EMaskSourceType type = FillLayer::initialFillMaskSourceType(layer->type());
|
| if (value.isInitialValue()) {
|
| @@ -278,14 +278,14 @@ void CSSToStyleMap::mapFillMaskSourceType(StyleResolverState&, FillLayer* layer,
|
| layer->setMaskSourceType(type);
|
| }
|
|
|
| -double CSSToStyleMap::mapAnimationDelay(CSSValue value)
|
| +double CSSToStyleMap::mapAnimationDelay(const CSSValue& value)
|
| {
|
| if (value.isInitialValue())
|
| return CSSTimingData::initialDelay();
|
| return toCSSPrimitiveValue(value).computeSeconds();
|
| }
|
|
|
| -Timing::PlaybackDirection CSSToStyleMap::mapAnimationDirection(CSSValue value)
|
| +Timing::PlaybackDirection CSSToStyleMap::mapAnimationDirection(const CSSValue& value)
|
| {
|
| if (value.isInitialValue())
|
| return CSSAnimationData::initialDirection();
|
| @@ -305,14 +305,14 @@ Timing::PlaybackDirection CSSToStyleMap::mapAnimationDirection(CSSValue value)
|
| }
|
| }
|
|
|
| -double CSSToStyleMap::mapAnimationDuration(CSSValue value)
|
| +double CSSToStyleMap::mapAnimationDuration(const CSSValue& value)
|
| {
|
| if (value.isInitialValue())
|
| return CSSTimingData::initialDuration();
|
| return toCSSPrimitiveValue(value).computeSeconds();
|
| }
|
|
|
| -Timing::FillMode CSSToStyleMap::mapAnimationFillMode(CSSValue value)
|
| +Timing::FillMode CSSToStyleMap::mapAnimationFillMode(const CSSValue& value)
|
| {
|
| if (value.isInitialValue())
|
| return CSSAnimationData::initialFillMode();
|
| @@ -332,7 +332,7 @@ Timing::FillMode CSSToStyleMap::mapAnimationFillMode(CSSValue value)
|
| }
|
| }
|
|
|
| -double CSSToStyleMap::mapAnimationIterationCount(CSSValue value)
|
| +double CSSToStyleMap::mapAnimationIterationCount(const CSSValue& value)
|
| {
|
| if (value.isInitialValue())
|
| return CSSAnimationData::initialIterationCount();
|
| @@ -342,7 +342,7 @@ double CSSToStyleMap::mapAnimationIterationCount(CSSValue value)
|
| return primitiveValue.getFloatValue();
|
| }
|
|
|
| -AtomicString CSSToStyleMap::mapAnimationName(CSSValue value)
|
| +AtomicString CSSToStyleMap::mapAnimationName(const CSSValue& value)
|
| {
|
| if (value.isInitialValue())
|
| return CSSAnimationData::initialName();
|
| @@ -352,7 +352,7 @@ AtomicString CSSToStyleMap::mapAnimationName(CSSValue value)
|
| return AtomicString(primitiveValue.getStringValue());
|
| }
|
|
|
| -EAnimPlayState CSSToStyleMap::mapAnimationPlayState(CSSValue value)
|
| +EAnimPlayState CSSToStyleMap::mapAnimationPlayState(const CSSValue& value)
|
| {
|
| if (value.isInitialValue())
|
| return CSSAnimationData::initialPlayState();
|
| @@ -362,7 +362,7 @@ EAnimPlayState CSSToStyleMap::mapAnimationPlayState(CSSValue value)
|
| return AnimPlayStatePlaying;
|
| }
|
|
|
| -CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSValue value)
|
| +CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(const CSSValue& value)
|
| {
|
| if (value.isInitialValue())
|
| return CSSTransitionData::initialProperty();
|
| @@ -376,7 +376,7 @@ CSSTransitionData::TransitionProperty CSSToStyleMap::mapAnimationProperty(CSSVal
|
| return CSSTransitionData::TransitionProperty(primitiveValue.getPropertyID());
|
| }
|
|
|
| -PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue value, bool allowStepMiddle)
|
| +PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(const CSSValue& value, bool allowStepMiddle)
|
| {
|
| // FIXME: We should probably only call into this function with a valid
|
| // single timing function value which isn't initial or inherit. We can
|
| @@ -424,7 +424,7 @@ PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue va
|
| return StepsTimingFunction::create(stepsTimingFunction.numberOfSteps(), stepsTimingFunction.stepAtPosition());
|
| }
|
|
|
| -void CSSToStyleMap::mapNinePieceImage(StyleResolverState& state, CSSPropertyID property, NullableCSSValue value, NinePieceImage& image)
|
| +void CSSToStyleMap::mapNinePieceImage(StyleResolverState& state, CSSPropertyID property, const NullableCSSValue& value, NinePieceImage& image)
|
| {
|
| // If we're not a value list, then we are "none" and don't need to alter the empty image at all.
|
| if (!value || !value->isValueList())
|
| @@ -443,7 +443,7 @@ void CSSToStyleMap::mapNinePieceImage(StyleResolverState& state, CSSPropertyID p
|
| imageProperty = property;
|
|
|
| for (unsigned i = 0 ; i < borderImage->length() ; ++i) {
|
| - CSSValue current = borderImage->item(i);
|
| + const CSSValue& current = borderImage->item(i);
|
|
|
| if (current.isImageValue() || current.isImageGeneratorValue() || current.isImageSetValue()) {
|
| image.setImage(state.styleImage(imageProperty, current));
|
| @@ -484,7 +484,7 @@ void CSSToStyleMap::mapNinePieceImage(StyleResolverState& state, CSSPropertyID p
|
| }
|
| }
|
|
|
| -void CSSToStyleMap::mapNinePieceImageSlice(StyleResolverState&, NullableCSSValue value, NinePieceImage& image)
|
| +void CSSToStyleMap::mapNinePieceImageSlice(StyleResolverState&, const NullableCSSValue& value, NinePieceImage& image)
|
| {
|
| if (!value || !value->isBorderImageSliceValue())
|
| return;
|
| @@ -528,7 +528,7 @@ static BorderImageLength toBorderImageLength(CSSPrimitiveValue& value, const CSS
|
| return Length(Auto);
|
| }
|
|
|
| -BorderImageLengthBox CSSToStyleMap::mapNinePieceImageQuad(StyleResolverState& state, NullableCSSValue value)
|
| +BorderImageLengthBox CSSToStyleMap::mapNinePieceImageQuad(StyleResolverState& state, const NullableCSSValue& value)
|
| {
|
| if (!value || !value->isPrimitiveValue())
|
| return BorderImageLengthBox(Length(Auto));
|
| @@ -543,7 +543,7 @@ BorderImageLengthBox CSSToStyleMap::mapNinePieceImageQuad(StyleResolverState& st
|
| toBorderImageLength(*slices->left(), state.cssToLengthConversionData()));
|
| }
|
|
|
| -void CSSToStyleMap::mapNinePieceImageRepeat(StyleResolverState&, NullableCSSValue value, NinePieceImage& image)
|
| +void CSSToStyleMap::mapNinePieceImageRepeat(StyleResolverState&, const NullableCSSValue& value, NinePieceImage& image)
|
| {
|
| if (!value || !value->isPrimitiveValue())
|
| return;
|
|
|