Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/css/resolver/CSSToStyleMap.cpp

Issue 1233363002: CSSValue Immediates: Replace CSSPrimitiveValue usage with const references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cssvalue_patch_4_attempt_2
Patch Set: Rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/CSSToStyleMap.h ('k') | Source/core/css/resolver/FilterOperationResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/CSSToStyleMap.cpp
diff --git a/Source/core/css/resolver/CSSToStyleMap.cpp b/Source/core/css/resolver/CSSToStyleMap.cpp
index bee7f7364e6c52fe3dec88ed3e428aa2a0290ee2..d8210129df5fac39dece2aab52a4b257afb0630b 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()));
@@ -53,7 +53,7 @@ void CSSToStyleMap::mapFillAttachment(StyleResolverState&, FillLayer* layer, CSS
if (!value.isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
switch (primitiveValue.getValueID()) {
case CSSValueFixed:
layer->setAttachment(FixedBackgroundAttachment);
@@ -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()));
@@ -79,11 +79,11 @@ void CSSToStyleMap::mapFillClip(StyleResolverState&, FillLayer* layer, CSSValue
if (!value.isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
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()));
@@ -93,11 +93,11 @@ void CSSToStyleMap::mapFillComposite(StyleResolverState&, FillLayer* layer, CSSV
if (!value.isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
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()));
@@ -107,11 +107,11 @@ void CSSToStyleMap::mapFillBlendMode(StyleResolverState&, FillLayer* layer, CSSV
if (!value.isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
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()));
@@ -121,12 +121,12 @@ void CSSToStyleMap::mapFillOrigin(StyleResolverState&, FillLayer* layer, CSSValu
if (!value.isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
layer->setOrigin(primitiveValue);
}
-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()));
@@ -147,11 +147,11 @@ void CSSToStyleMap::mapFillRepeatX(StyleResolverState&, FillLayer* layer, CSSVal
if (!value.isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
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()));
@@ -161,11 +161,11 @@ void CSSToStyleMap::mapFillRepeatY(StyleResolverState&, FillLayer* layer, CSSVal
if (!value.isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
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()));
@@ -176,7 +176,7 @@ void CSSToStyleMap::mapFillSize(StyleResolverState& state, FillLayer* layer, CSS
if (!value.isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.getValueID() == CSSValueContain)
layer->setSizeType(Contain);
else if (primitiveValue.getValueID() == CSSValueCover)
@@ -195,8 +195,8 @@ void CSSToStyleMap::mapFillSize(StyleResolverState& state, FillLayer* layer, CSS
Length secondLength;
if (Pair* pair = primitiveValue.getPairValue()) {
- firstLength = StyleBuilderConverter::convertLengthOrAuto(state, CSSValue(*pair->first()));
- secondLength = StyleBuilderConverter::convertLengthOrAuto(state, CSSValue(*pair->second()));
+ firstLength = StyleBuilderConverter::convertLengthOrAuto(state, pair->first());
+ secondLength = StyleBuilderConverter::convertLengthOrAuto(state, pair->second());
} else {
firstLength = StyleBuilderConverter::convertLengthOrAuto(state, value);
secondLength = Length();
@@ -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()));
@@ -220,16 +220,16 @@ void CSSToStyleMap::mapFillXPosition(StyleResolverState& state, FillLayer* layer
CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
Pair* pair = primitiveValue.getPairValue();
if (pair)
- primitiveValue = toCSSPrimitiveValue(*pair->second());
+ primitiveValue = pair->second();
Length length = primitiveValue.convertToLength(state.cssToLengthConversionData());
layer->setXPosition(length);
if (pair)
- layer->setBackgroundXOrigin(toCSSPrimitiveValue(*pair->first()));
+ 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()));
@@ -242,16 +242,16 @@ void CSSToStyleMap::mapFillYPosition(StyleResolverState& state, FillLayer* layer
CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
Pair* pair = primitiveValue.getPairValue();
if (pair)
- primitiveValue = toCSSPrimitiveValue(*pair->second());
+ primitiveValue = pair->second();
Length length = primitiveValue.convertToLength(state.cssToLengthConversionData());
layer->setYPosition(length);
if (pair)
- layer->setBackgroundYOrigin(toCSSPrimitiveValue(*pair->first()));
+ 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,27 +332,27 @@ Timing::FillMode CSSToStyleMap::mapAnimationFillMode(CSSValue value)
}
}
-double CSSToStyleMap::mapAnimationIterationCount(CSSValue value)
+double CSSToStyleMap::mapAnimationIterationCount(const CSSValue& value)
{
if (value.isInitialValue())
return CSSAnimationData::initialIterationCount();
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.getValueID() == CSSValueInfinite)
return std::numeric_limits<double>::infinity();
return primitiveValue.getFloatValue();
}
-AtomicString CSSToStyleMap::mapAnimationName(CSSValue value)
+AtomicString CSSToStyleMap::mapAnimationName(const CSSValue& value)
{
if (value.isInitialValue())
return CSSAnimationData::initialName();
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.getValueID() == CSSValueNone)
return CSSAnimationData::initialName();
return AtomicString(primitiveValue.getStringValue());
}
-EAnimPlayState CSSToStyleMap::mapAnimationPlayState(CSSValue value)
+EAnimPlayState CSSToStyleMap::mapAnimationPlayState(const CSSValue& value)
{
if (value.isInitialValue())
return CSSAnimationData::initialPlayState();
@@ -362,11 +362,11 @@ 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();
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.isCustomIdent())
return CSSTransitionData::TransitionProperty(primitiveValue.getStringValue());
if (primitiveValue.getValueID() == CSSValueAll)
@@ -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
@@ -384,7 +384,7 @@ PassRefPtr<TimingFunction> CSSToStyleMap::mapAnimationTimingFunction(CSSValue va
// properties in shorthands to initial.
if (value.isPrimitiveValue()) {
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
switch (primitiveValue.getValueID()) {
case CSSValueLinear:
return LinearTimingFunction::shared();
@@ -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));
@@ -517,7 +517,7 @@ void CSSToStyleMap::mapNinePieceImageSlice(StyleResolverState&, NullableCSSValue
image.setFill(borderImageSlice->m_fill);
}
-static BorderImageLength toBorderImageLength(CSSPrimitiveValue value, const CSSToLengthConversionData& conversionData)
+static BorderImageLength toBorderImageLength(const CSSPrimitiveValue& value, const CSSToLengthConversionData& conversionData)
{
if (value.isNumber())
return value.getDoubleValue();
@@ -548,13 +548,13 @@ void CSSToStyleMap::mapNinePieceImageRepeat(StyleResolverState&, NullableCSSValu
if (!value || !value->isPrimitiveValue())
return;
- CSSPrimitiveValue primitiveValue = toCSSPrimitiveValue(*value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(*value);
Pair* pair = primitiveValue.getPairValue();
- if (!pair || !pair->first() || !pair->second())
+ if (!pair)
return;
- CSSValueID firstIdentifier = toCSSPrimitiveValue(*pair->first()).getValueID();
- CSSValueID secondIdentifier = toCSSPrimitiveValue(*pair->second()).getValueID();
+ CSSValueID firstIdentifier = pair->first().getValueID();
+ CSSValueID secondIdentifier = pair->second().getValueID();
ENinePieceImageRule horizontalRule;
switch (firstIdentifier) {
« no previous file with comments | « Source/core/css/resolver/CSSToStyleMap.h ('k') | Source/core/css/resolver/FilterOperationResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698