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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1249553002: CSSValue Immediates: Add move operators to CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cssvalue_patch_3_tagged_ptrs_with_copy_ops_mv_operators_ref_primvalue
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/StyleBuilderConverter.cpp ('k') | Source/core/css/resolver/TransformBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleBuilderCustom.cpp
diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
index 37f8a0e9758dd2a56df2b9f3ac746bb036dbe91c..901e853080280e725200edcc906043727caa0f5f 100644
--- a/Source/core/css/resolver/StyleBuilderCustom.cpp
+++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
@@ -152,7 +152,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyColor(StyleResolverState& sta
void StyleBuilderFunctions::applyValueCSSPropertyColor(StyleResolverState& state, const CSSValue& value)
{
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
// As per the spec, 'color: currentColor' is treated as 'color: inherit'
if (primitiveValue.getValueID() == CSSValueCurrentcolor) {
applyInheritCSSPropertyColor(state);
@@ -271,14 +271,14 @@ void StyleBuilderFunctions::applyInheritCSSPropertyOutlineStyle(StyleResolverSta
void StyleBuilderFunctions::applyValueCSSPropertyOutlineStyle(StyleResolverState& state, const CSSValue& value)
{
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
state.style()->setOutlineStyleIsAuto(primitiveValue);
state.style()->setOutlineStyle(primitiveValue);
}
void StyleBuilderFunctions::applyValueCSSPropertyResize(StyleResolverState& state, const CSSValue& value)
{
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
EResize r = RESIZE_NONE;
if (primitiveValue.getValueID() == CSSValueAuto) {
@@ -292,7 +292,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyResize(StyleResolverState& stat
static float mmToPx(float mm) { return mm * cssPixelsPerMillimeter; }
static float inchToPx(float inch) { return inch * cssPixelsPerInch; }
-static FloatSize getPageSizeFromName(CSSPrimitiveValue& pageSizeName)
+static FloatSize getPageSizeFromName(CSSPrimitiveValue pageSizeName)
{
switch (pageSizeName.getValueID()) {
case CSSValueA5:
@@ -324,11 +324,11 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
state.style()->resetPageSizeType();
FloatSize size;
PageSizeType pageSizeType = PAGE_SIZE_AUTO;
- CSSValueList& list = toCSSValueList(value);
+ const CSSValueList& list = toCSSValueList(value);
if (list.length() == 2) {
// <length>{2} | <page-size> <orientation>
- CSSPrimitiveValue& first = toCSSPrimitiveValue(list.item(0));
- CSSPrimitiveValue& second = toCSSPrimitiveValue(list.item(1));
+ const CSSPrimitiveValue& first = toCSSPrimitiveValue(list.item(0));
+ const CSSPrimitiveValue& second = toCSSPrimitiveValue(list.item(1));
if (first.isLength()) {
// <length>{2}
size = FloatSize(first.computeLength<float>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0)),
@@ -345,7 +345,7 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
} else {
ASSERT(list.length() == 1);
// <length> | auto | <page-size> | [ portrait | landscape]
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(list.item(0));
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(list.item(0));
if (primitiveValue.isLength()) {
// <length>
pageSizeType = PAGE_SIZE_RESOLVED;
@@ -375,7 +375,7 @@ void StyleBuilderFunctions::applyValueCSSPropertySize(StyleResolverState& state,
void StyleBuilderFunctions::applyValueCSSPropertyTextAlign(StyleResolverState& state, const CSSValue& value)
{
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.isValueID() && primitiveValue.getValueID() != CSSValueWebkitMatchParent)
state.style()->setTextAlign(primitiveValue);
else if (state.parentStyle()->textAlign() == TASTART)
@@ -407,7 +407,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyTextIndent(StyleResolverState&
TextIndentType textIndentTypeValue = ComputedStyle::initialTextIndentType();
for (auto& listValue : toCSSValueList(value)) {
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(listValue);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(listValue);
if (!primitiveValue.getValueID())
lengthOrPercentageValue = primitiveValue.convertToLength(state.cssToLengthConversionData());
else if (primitiveValue.getValueID() == CSSValueEachLine)
@@ -479,7 +479,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyMotionRotation(StyleResolverSta
for (int i = 0; i < len; i++) {
const CSSValue& item = list.item(i);
ASSERT(item.isPrimitiveValue());
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(item);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(item);
if (primitiveValue.getValueID() == CSSValueAuto) {
rotationType = MotionRotationAuto;
} else if (primitiveValue.getValueID() == CSSValueReverse) {
@@ -504,7 +504,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyVerticalAlign(StyleResolverSt
void StyleBuilderFunctions::applyValueCSSPropertyVerticalAlign(StyleResolverState& state, const CSSValue& value)
{
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.getValueID())
state.style()->setVerticalAlign(primitiveValue);
@@ -533,7 +533,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyZoom(StyleResolverState& stat
void StyleBuilderFunctions::applyValueCSSPropertyZoom(StyleResolverState& state, const CSSValue& value)
{
ASSERT_WITH_SECURITY_IMPLICATION(value.isPrimitiveValue());
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.getValueID() == CSSValueNormal) {
resetEffectiveZoom(state);
@@ -566,7 +566,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitBorderImage(StyleResolver
void StyleBuilderFunctions::applyValueCSSPropertyWebkitClipPath(StyleResolverState& state, const CSSValue& value)
{
if (value.isPrimitiveValue()) {
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.getValueID() == CSSValueNone) {
state.style()->setClipPath(nullptr);
} else if (primitiveValue.isShape()) {
@@ -607,7 +607,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextEmphasisStyle(StyleRe
CSSValueList& list = toCSSValueList(value);
ASSERT(list.length() == 2);
for (unsigned i = 0; i < 2; ++i) {
- CSSPrimitiveValue& value = toCSSPrimitiveValue(list.item(i));
+ const CSSPrimitiveValue& value = toCSSPrimitiveValue(list.item(i));
if (value.getValueID() == CSSValueFilled || value.getValueID() == CSSValueOpen)
state.style()->setTextEmphasisFill(value);
else
@@ -617,7 +617,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWebkitTextEmphasisStyle(StyleRe
return;
}
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (primitiveValue.isString()) {
state.style()->setTextEmphasisFill(TextEmphasisFillFilled);
@@ -661,7 +661,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyWillChange(StyleResolverState&
Vector<CSSPropertyID> willChangeProperties;
for (auto& willChangeValue : toCSSValueList(value)) {
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(willChangeValue);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(willChangeValue);
if (CSSPropertyID propertyID = primitiveValue.getPropertyID())
willChangeProperties.append(propertyID);
else if (primitiveValue.getValueID() == CSSValueContents)
@@ -711,7 +711,7 @@ void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& sta
if (!item.isPrimitiveValue())
continue;
- CSSPrimitiveValue& contentValue = toCSSPrimitiveValue(item);
+ const CSSPrimitiveValue& contentValue = toCSSPrimitiveValue(item);
if (contentValue.isString()) {
state.style()->setContent(contentValue.getStringValue().impl(), didSet);
@@ -811,7 +811,7 @@ void StyleBuilderFunctions::applyInheritCSSPropertyBaselineShift(StyleResolverSt
void StyleBuilderFunctions::applyValueCSSPropertyBaselineShift(StyleResolverState& state, const CSSValue& value)
{
SVGComputedStyle& svgStyle = state.style()->accessSVGStyle();
- CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
+ const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
if (!primitiveValue.isValueID()) {
svgStyle.setBaselineShift(BS_LENGTH);
svgStyle.setBaselineShiftValue(StyleBuilderConverter::convertLength(state, value));
« no previous file with comments | « Source/core/css/resolver/StyleBuilderConverter.cpp ('k') | Source/core/css/resolver/TransformBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698