Skip to content

GitLab

T
tangled
Commit 3ce9c7d3 authored by Darren Shen's avatar Darren Shen Committed by Commit Bot
Browse files
Options

[css-typed-om] Implement CSSMathValue serialization. 

This patch implements the new CSSMathValue serialization algorithm [1].
As explained in the bug, this serialization is impossible to do by
converting to CSSValues and then serializing them, so we have to
implement this from scratch.

We tried to make the code follow the spec algorithm as closely as
possible for easier understanding/verification.

[1] https://drafts.css-houdini.org/css-typed-om-1/#calc-serialization

Bug: 803688
Change-Id: I48987d2b76b0bac55389a014588f3fe40aecf10a
Reviewed-on: https://chromium-review.googlesource.com/896422Reviewed-by: default avatarnainar <nainar@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533530}
parent 482fd9a3
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 65 deletions
third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/stylevalue-serialization/cssMathValue.tentative-expected.txt deleted 100644 → 0
View file @ 482fd9a3
This is a testharness.js-based test.
PASS CSSMathSum with 1 argument serializes correctly
PASS CSSMathSum with 2 arguments serializes correctly
PASS CSSMathSum with more than 2 arguments serializes correctly
PASS CSSMathProduct with 1 argument serializes correctly
PASS CSSMathProduct with 2 arguments serializes correctly
PASS CSSMathProduct with more than 2 arguments serializes correctly
FAIL CSSMathProduct of two different base types serializes correctly Failed to execute 'toString' on 'CSSStyleValue': Some CSSMathValues can't be serialized yet. See crbug.com/803739
FAIL CSSMathMax with one argument serializes correctly Failed to execute 'toString' on 'CSSStyleValue': Some CSSMathValues can't be serialized yet. See crbug.com/803739
FAIL CSSMathMax with more than one argument serializes correctly Failed to execute 'toString' on 'CSSStyleValue': Some CSSMathValues can't be serialized yet. See crbug.com/803739
FAIL CSSMathMin with one argument serializes correctly Failed to execute 'toString' on 'CSSStyleValue': Some CSSMathValues can't be serialized yet. See crbug.com/803739
FAIL CSSMathMin with more than one argument serializes correctly Failed to execute 'toString' on 'CSSStyleValue': Some CSSMathValues can't be serialized yet. See crbug.com/803739
FAIL CSSMathNegate serializes correctly Failed to execute 'toString' on 'CSSStyleValue': Some CSSMathValues can't be serialized yet. See crbug.com/803739
FAIL CSSMathInvert serializes correctly Failed to execute 'toString' on 'CSSStyleValue': Some CSSMathValues can't be serialized yet. See crbug.com/803739
Harness: the test ran to completion.
third_party/WebKit/LayoutTests/external/wpt/css/css-typed-om/stylevalue-serialization/cssMathValue.tentative.html
View file @ 3ce9c7d3
<!doctype html> <!doctype html>
<meta charset="utf-8"> <meta charset="utf-8">
<title>IDL-constructed CSSMathValue serialization tests</title> <title>IDL-constructed CSSMathValue serialization tests</title>
<!-- Tentative because this depends on css-values-4 spec, which is still WIP:
https://drafts.csswg.org/css-values-4/#calc-notation -->
<link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#calc-serialization"> <link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#calc-serialization">
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
...@@ -12,69 +10,104 @@ ...@@ -12,69 +10,104 @@
const gTestCases = [ const gTestCases = [
{ {
description: 'CSSMathSum with 1 argument', description: 'CSSMathMax with one argument',
value: new CSSMathSum(CSS.px(1)), value: new CSSMathMax(1),
cssText: 'calc(1px)', cssText: 'max(1)',
}, },
{ {
description: 'CSSMathSum with 2 arguments', description: 'CSSMathMax with more than one argument',
value: new CSSMathSum(CSS.px(1), CSS.px(2)), value: new CSSMathMax(1, 2, 3),
cssText: 'calc(1px + 2px)', cssText: 'max(1, 2, 3)',
}, },
{ {
description: 'CSSMathSum with more than 2 arguments', description: 'CSSMathMax containing nested CSSMathValues',
value: new CSSMathSum(CSS.px(1), CSS.px(2), CSS.px(3)), value: new CSSMathMax(new CSSMathSum(1, 2), 3),
cssText: 'calc((1px + 2px) + 3px)', cssText: 'max(1 + 2, 3)',
}, },
{ {
description: 'CSSMathProduct with 1 argument', description: 'CSSMathMin with one argument',
value: new CSSMathProduct(CSS.px(1)), value: new CSSMathMin(1),
cssText: 'calc(1px)', cssText: 'min(1)',
}, },
{ {
description: 'CSSMathProduct with 2 arguments', description: 'CSSMathMin with more than one argument',
value: new CSSMathProduct(CSS.px(1), 2), value: new CSSMathMin(1, 2, 3),
cssText: 'calc(1px * 2)', cssText: 'min(1, 2, 3)',
}, },
{ {
description: 'CSSMathProduct with more than 2 arguments', description: 'CSSMathMin containing nested CSSMathValues',
value: new CSSMathProduct(CSS.px(1), 2, 3), value: new CSSMathMin(new CSSMathSum(1, 2), 3),
cssText: 'calc((1px * 2) * 3)', cssText: 'min(1 + 2, 3)',
}, },
{ {
description: 'CSSMathProduct of two different base types', description: 'CSSMathSum with one argument',
value: new CSSMathProduct(CSS.px(1), CSS.s(1)), value: new CSSMathSum(1),
cssText: 'calc(1px * 1s)', cssText: 'calc(1)',
}, },
{ {
description: 'CSSMathMax with one argument', description: 'CSSMathSum with more than one argument',
value: new CSSMathMax(CSS.px(2)), value: new CSSMathSum(1, 2, 3),
cssText: 'max(1px)', cssText: 'calc(1 + 2 + 3)',
}, },
{ {
description: 'CSSMathMax with more than one argument', description: 'CSSMathSum with a CSSMathNegate as first value',
value: new CSSMathMax(CSS.px(2), CSS.px(1)), value: new CSSMathSum(new CSSMathNegate(1), 2, 3),
cssText: 'max(1px, 1s)', cssText: 'calc((-1) + 2 + 3)',
}, },
{ {
description: 'CSSMathMin with one argument', description: 'CSSMathSum containing a CSSMathNegate after first value',
value: new CSSMathMin(CSS.px(1)), value: new CSSMathSum(1, new CSSMathNegate(2), 3),
cssText: 'min(1px)', cssText: 'calc(1 - 2 + 3)',
}, },
{ {
description: 'CSSMathMin with more than one argument', description: 'CSSMathSum nested inside a CSSMathValue',
value: new CSSMathMin(CSS.px(1), CSS.px(2)), value: new CSSMathSum(new CSSMathSum(1, 2), 3),
cssText: 'min(1px, 2px)', cssText: 'calc((1 + 2) + 3)',
}, },
{ {
description: 'CSSMathNegate', description: 'CSSMathNegate',
value: new CSSMathNegate(CSS.px(1)), value: new CSSMathNegate(1),
cssText: 'calc(- 1px)', cssText: 'calc(-1)',
},
{
description: 'CSSMathNegate nested inside a CSSMathValue',
value: new CSSMathProduct(new CSSMathNegate(1)),
cssText: 'calc((-1))',
},
{
description: 'CSSMathProduct with one argument',
value: new CSSMathProduct(1),
cssText: 'calc(1)',
},
{
description: 'CSSMathProduct with more than one argument',
value: new CSSMathProduct(1, 2, 3),
cssText: 'calc(1 * 2 * 3)',
},
{
description: 'CSSMathProduct with a CSSMathInvert as first value',
value: new CSSMathProduct(new CSSMathInvert(1), 2, 3),
cssText: 'calc((1 / 1) * 2 * 3)',
},
{
description: 'CSSMathProduct containing a CSSMathInvert after first value',
value: new CSSMathProduct(1, new CSSMathInvert(2), 3),
cssText: 'calc(1 / 2 * 3)',
},
{
description: 'CSSMathProduct nested inside a CSSMathValue',
value: new CSSMathProduct(new CSSMathProduct(1, 2), 3),
cssText: 'calc((1 * 2) * 3)',
}, },
{ {
description: 'CSSMathInvert', description: 'CSSMathInvert',
value: new CSSMathInvert(CSS.px(1)), value: new CSSMathInvert(1),
cssText: 'calc(1 / 1px)', cssText: 'calc(1 / 1)',
},
{
description: 'CSSMathInvert nested inside a CSSMathValue',
value: new CSSMathSum(new CSSMathInvert(1)),
cssText: 'calc((1 / 1))',
}, },
]; ];
......
third_party/WebKit/Source/core/css/cssom/CSSMathInvert.cpp
View file @ 3ce9c7d3
...@@ -20,4 +20,17 @@ WTF::Optional<CSSNumericSumValue> CSSMathInvert::SumValue() const { ...@@ -20,4 +20,17 @@ WTF::Optional<CSSNumericSumValue> CSSMathInvert::SumValue() const {
return sum; return sum;
} }
void CSSMathInvert::BuildCSSText(Nested nested,
ParenLess paren_less,
StringBuilder& result) const {
if (paren_less == ParenLess::kNo)
result.Append(nested == Nested::kYes ? "(" : "calc(");
result.Append("1 / ");
value_->BuildCSSText(Nested::kYes, ParenLess::kNo, result);
if (paren_less == ParenLess::kNo)
result.Append(")");
}
} // namespace blink } // namespace blink
third_party/WebKit/Source/core/css/cssom/CSSMathInvert.h
View file @ 3ce9c7d3
...@@ -30,6 +30,9 @@ class CORE_EXPORT CSSMathInvert : public CSSMathValue { ...@@ -30,6 +30,9 @@ class CORE_EXPORT CSSMathInvert : public CSSMathValue {
void value(CSSNumberish& value) { value.SetCSSNumericValue(value_); } void value(CSSNumberish& value) { value.SetCSSNumericValue(value_); }
// Blink-internal methods
const CSSNumericValue& Value() const { return *value_; }
// From CSSStyleValue. // From CSSStyleValue.
StyleValueType GetType() const final { return CSSStyleValue::kInvertType; } StyleValueType GetType() const final { return CSSStyleValue::kInvertType; }
...@@ -60,6 +63,8 @@ class CORE_EXPORT CSSMathInvert : public CSSMathValue { ...@@ -60,6 +63,8 @@ class CORE_EXPORT CSSMathInvert : public CSSMathValue {
CSSNumericValue* Invert() final { return value_.Get(); } CSSNumericValue* Invert() final { return value_.Get(); }
WTF::Optional<CSSNumericSumValue> SumValue() const final; WTF::Optional<CSSNumericSumValue> SumValue() const final;
void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
Member<CSSNumericValue> value_; Member<CSSNumericValue> value_;
DISALLOW_COPY_AND_ASSIGN(CSSMathInvert); DISALLOW_COPY_AND_ASSIGN(CSSMathInvert);
}; };
......
third_party/WebKit/Source/core/css/cssom/CSSMathMax.cpp
View file @ 3ce9c7d3
...@@ -50,4 +50,20 @@ WTF::Optional<CSSNumericSumValue> CSSMathMax::SumValue() const { ...@@ -50,4 +50,20 @@ WTF::Optional<CSSNumericSumValue> CSSMathMax::SumValue() const {
return cur_max; return cur_max;
} }
void CSSMathMax::BuildCSSText(Nested, ParenLess, StringBuilder& result) const {
result.Append("max(");
bool first_iteration = true;
for (const auto& value : NumericValues()) {
if (!first_iteration)
result.Append(", ");
first_iteration = false;
DCHECK(value);
value->BuildCSSText(Nested::kYes, ParenLess::kYes, result);
}
result.Append(")");
}
} // namespace blink } // namespace blink
third_party/WebKit/Source/core/css/cssom/CSSMathMax.h
View file @ 3ce9c7d3
...@@ -36,6 +36,8 @@ class CORE_EXPORT CSSMathMax final : public CSSMathVariadic { ...@@ -36,6 +36,8 @@ class CORE_EXPORT CSSMathMax final : public CSSMathVariadic {
CSSMathMax(CSSNumericArray* values, const CSSNumericValueType& type) CSSMathMax(CSSNumericArray* values, const CSSNumericValueType& type)
: CSSMathVariadic(values, type) {} : CSSMathVariadic(values, type) {}
void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
WTF::Optional<CSSNumericSumValue> SumValue() const final; WTF::Optional<CSSNumericSumValue> SumValue() const final;
DISALLOW_COPY_AND_ASSIGN(CSSMathMax); DISALLOW_COPY_AND_ASSIGN(CSSMathMax);
}; };
......
third_party/WebKit/Source/core/css/cssom/CSSMathMin.cpp
View file @ 3ce9c7d3
...@@ -50,4 +50,19 @@ WTF::Optional<CSSNumericSumValue> CSSMathMin::SumValue() const { ...@@ -50,4 +50,19 @@ WTF::Optional<CSSNumericSumValue> CSSMathMin::SumValue() const {
return cur_min; return cur_min;
} }
void CSSMathMin::BuildCSSText(Nested, ParenLess, StringBuilder& result) const {
result.Append("min(");
bool first_iteration = true;
for (const auto& value : NumericValues()) {
if (!first_iteration)
result.Append(", ");
first_iteration = false;
value->BuildCSSText(Nested::kYes, ParenLess::kYes, result);
}
result.Append(")");
}
} // namespace blink } // namespace blink
third_party/WebKit/Source/core/css/cssom/CSSMathMin.h
View file @ 3ce9c7d3
...@@ -38,6 +38,8 @@ class CORE_EXPORT CSSMathMin final : public CSSMathVariadic { ...@@ -38,6 +38,8 @@ class CORE_EXPORT CSSMathMin final : public CSSMathVariadic {
CSSMathMin(CSSNumericArray* values, const CSSNumericValueType& type) CSSMathMin(CSSNumericArray* values, const CSSNumericValueType& type)
: CSSMathVariadic(values, type) {} : CSSMathVariadic(values, type) {}
void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
WTF::Optional<CSSNumericSumValue> SumValue() const final; WTF::Optional<CSSNumericSumValue> SumValue() const final;
DISALLOW_COPY_AND_ASSIGN(CSSMathMin); DISALLOW_COPY_AND_ASSIGN(CSSMathMin);
}; };
......
third_party/WebKit/Source/core/css/cssom/CSSMathNegate.cpp
View file @ 3ce9c7d3
...@@ -18,4 +18,17 @@ WTF::Optional<CSSNumericSumValue> CSSMathNegate::SumValue() const { ...@@ -18,4 +18,17 @@ WTF::Optional<CSSNumericSumValue> CSSMathNegate::SumValue() const {
return maybe_sum; return maybe_sum;
} }
void CSSMathNegate::BuildCSSText(Nested nested,
ParenLess paren_less,
StringBuilder& result) const {
if (paren_less == ParenLess::kNo)
result.Append(nested == Nested::kYes ? "(" : "calc(");
result.Append("-");
value_->BuildCSSText(Nested::kYes, ParenLess::kNo, result);
if (paren_less == ParenLess::kNo)
result.Append(")");
}
} // namespace blink } // namespace blink
third_party/WebKit/Source/core/css/cssom/CSSMathNegate.h
View file @ 3ce9c7d3
...@@ -29,6 +29,9 @@ class CORE_EXPORT CSSMathNegate : public CSSMathValue { ...@@ -29,6 +29,9 @@ class CORE_EXPORT CSSMathNegate : public CSSMathValue {
void value(CSSNumberish& value) { value.SetCSSNumericValue(value_); } void value(CSSNumberish& value) { value.SetCSSNumericValue(value_); }
// Blink-internal methods
const CSSNumericValue& Value() const { return *value_; }
// From CSSStyleValue. // From CSSStyleValue.
StyleValueType GetType() const final { return CSSStyleValue::kNegateType; } StyleValueType GetType() const final { return CSSStyleValue::kNegateType; }
...@@ -59,6 +62,8 @@ class CORE_EXPORT CSSMathNegate : public CSSMathValue { ...@@ -59,6 +62,8 @@ class CORE_EXPORT CSSMathNegate : public CSSMathValue {
CSSNumericValue* Negate() final { return value_.Get(); } CSSNumericValue* Negate() final { return value_.Get(); }
WTF::Optional<CSSNumericSumValue> SumValue() const final; WTF::Optional<CSSNumericSumValue> SumValue() const final;
void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
Member<CSSNumericValue> value_; Member<CSSNumericValue> value_;
DISALLOW_COPY_AND_ASSIGN(CSSMathNegate); DISALLOW_COPY_AND_ASSIGN(CSSMathNegate);
}; };
......
third_party/WebKit/Source/core/css/cssom/CSSMathProduct.cpp
View file @ 3ce9c7d3
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "core/css/cssom/CSSMathProduct.h" #include "core/css/cssom/CSSMathProduct.h"
#include "core/css/CSSCalculationValue.h" #include "core/css/CSSCalculationValue.h"
#include "core/css/cssom/CSSMathInvert.h"
namespace blink { namespace blink {
...@@ -94,4 +95,30 @@ CSSCalcExpressionNode* CSSMathProduct::ToCalcExpressionNode() const { ...@@ -94,4 +95,30 @@ CSSCalcExpressionNode* CSSMathProduct::ToCalcExpressionNode() const {
return node; return node;
} }
void CSSMathProduct::BuildCSSText(Nested nested,
ParenLess paren_less,
StringBuilder& result) const {
if (paren_less == ParenLess::kNo)
result.Append(nested == Nested::kYes ? "(" : "calc(");
const auto& values = NumericValues();
DCHECK(!values.IsEmpty());
values[0]->BuildCSSText(Nested::kYes, ParenLess::kNo, result);
for (size_t i = 1; i < values.size(); i++) {
const auto& arg = *values[i];
if (arg.GetType() == CSSStyleValue::kInvertType) {
result.Append(" / ");
static_cast<const CSSMathInvert&>(arg).Value().BuildCSSText(
Nested::kYes, ParenLess::kNo, result);
} else {
result.Append(" * ");
arg.BuildCSSText(Nested::kYes, ParenLess::kNo, result);
}
}
if (paren_less == ParenLess::kNo)
result.Append(")");
}
} // namespace blink } // namespace blink
third_party/WebKit/Source/core/css/cssom/CSSMathProduct.h
View file @ 3ce9c7d3
...@@ -33,6 +33,8 @@ class CORE_EXPORT CSSMathProduct final : public CSSMathVariadic { ...@@ -33,6 +33,8 @@ class CORE_EXPORT CSSMathProduct final : public CSSMathVariadic {
CSSMathProduct(CSSNumericArray* values, const CSSNumericValueType& type) CSSMathProduct(CSSNumericArray* values, const CSSNumericValueType& type)
: CSSMathVariadic(values, type) {} : CSSMathVariadic(values, type) {}
void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
WTF::Optional<CSSNumericSumValue> SumValue() const final; WTF::Optional<CSSNumericSumValue> SumValue() const final;
DISALLOW_COPY_AND_ASSIGN(CSSMathProduct); DISALLOW_COPY_AND_ASSIGN(CSSMathProduct);
}; };
......
third_party/WebKit/Source/core/css/cssom/CSSMathSum.cpp
View file @ 3ce9c7d3
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "core/css/cssom/CSSMathSum.h" #include "core/css/cssom/CSSMathSum.h"
#include "core/css/CSSCalculationValue.h" #include "core/css/CSSCalculationValue.h"
#include "core/css/cssom/CSSMathNegate.h"
namespace blink { namespace blink {
...@@ -112,4 +113,30 @@ CSSCalcExpressionNode* CSSMathSum::ToCalcExpressionNode() const { ...@@ -112,4 +113,30 @@ CSSCalcExpressionNode* CSSMathSum::ToCalcExpressionNode() const {
return node; return node;
} }
void CSSMathSum::BuildCSSText(Nested nested,
ParenLess paren_less,
StringBuilder& result) const {
if (paren_less == ParenLess::kNo)
result.Append(nested == Nested::kYes ? "(" : "calc(");
const auto& values = NumericValues();
DCHECK(!values.IsEmpty());
values[0]->BuildCSSText(Nested::kYes, ParenLess::kNo, result);
for (size_t i = 1; i < values.size(); i++) {
const auto& arg = *values[i];
if (arg.GetType() == CSSStyleValue::kNegateType) {
result.Append(" - ");
static_cast<const CSSMathNegate&>(arg).Value().BuildCSSText(
Nested::kYes, ParenLess::kNo, result);
} else {
result.Append(" + ");
arg.BuildCSSText(Nested::kYes, ParenLess::kNo, result);
}
}
if (paren_less == ParenLess::kNo)
result.Append(")");
}
} // namespace blink } // namespace blink
third_party/WebKit/Source/core/css/cssom/CSSMathSum.h
View file @ 3ce9c7d3
...@@ -33,6 +33,8 @@ class CORE_EXPORT CSSMathSum final : public CSSMathVariadic { ...@@ -33,6 +33,8 @@ class CORE_EXPORT CSSMathSum final : public CSSMathVariadic {
CSSMathSum(CSSNumericArray* values, const CSSNumericValueType& type) CSSMathSum(CSSNumericArray* values, const CSSNumericValueType& type)
: CSSMathVariadic(values, type) {} : CSSMathVariadic(values, type) {}
void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
WTF::Optional<CSSNumericSumValue> SumValue() const final; WTF::Optional<CSSNumericSumValue> SumValue() const final;
DISALLOW_COPY_AND_ASSIGN(CSSMathSum); DISALLOW_COPY_AND_ASSIGN(CSSMathSum);
}; };
......
third_party/WebKit/Source/core/css/cssom/CSSNumericValue.cpp
View file @ 3ce9c7d3
...@@ -465,6 +465,12 @@ bool CSSNumericValue::equals(const HeapVector<CSSNumberish>& args) { ...@@ -465,6 +465,12 @@ bool CSSNumericValue::equals(const HeapVector<CSSNumberish>& args) {
[this](const auto& v) { return this->Equals(*v); }); [this](const auto& v) { return this->Equals(*v); });
} }
String CSSNumericValue::toString() const {
StringBuilder result;
BuildCSSText(Nested::kNo, ParenLess::kNo, result);
return result.ToString();
}
CSSNumericValue* CSSNumericValue::Negate() { CSSNumericValue* CSSNumericValue::Negate() {
return CSSMathNegate::Create(this); return CSSMathNegate::Create(this);
} }
......
third_party/WebKit/Source/core/css/cssom/CSSNumericValue.h
View file @ 3ce9c7d3
...@@ -52,6 +52,8 @@ class CORE_EXPORT CSSNumericValue : public CSSStyleValue { ...@@ -52,6 +52,8 @@ class CORE_EXPORT CSSNumericValue : public CSSStyleValue {
void type(CSSNumericType&) const; void type(CSSNumericType&) const;
String toString() const final;
// Internal methods. // Internal methods.
// Arithmetic // Arithmetic
virtual CSSNumericValue* Negate(); virtual CSSNumericValue* Negate();
...@@ -67,6 +69,10 @@ class CORE_EXPORT CSSNumericValue : public CSSStyleValue { ...@@ -67,6 +69,10 @@ class CORE_EXPORT CSSNumericValue : public CSSStyleValue {
virtual CSSCalcExpressionNode* ToCalcExpressionNode() const = 0; virtual CSSCalcExpressionNode* ToCalcExpressionNode() const = 0;
enum class Nested : bool { kYes, kNo };
enum class ParenLess : bool { kYes, kNo };
virtual void BuildCSSText(Nested, ParenLess, StringBuilder&) const = 0;
protected: protected:
static bool IsValidUnit(CSSPrimitiveValue::UnitType); static bool IsValidUnit(CSSPrimitiveValue::UnitType);
static CSSPrimitiveValue::UnitType UnitFromName(const String& name); static CSSPrimitiveValue::UnitType UnitFromName(const String& name);
......
third_party/WebKit/Source/core/css/cssom/CSSStyleValue.cpp
View file @ 3ce9c7d3
...@@ -73,15 +73,9 @@ Optional<CSSStyleValueVector> CSSStyleValue::parseAll( ...@@ -73,15 +73,9 @@ Optional<CSSStyleValueVector> CSSStyleValue::parseAll(
return style_value_vector; return style_value_vector;
} }
String CSSStyleValue::toString(ExceptionState& exception_state) const { String CSSStyleValue::toString() const {
const CSSValue* result = ToCSSValue(); const CSSValue* result = ToCSSValue();
// TODO(crbug.com/803739): Remove this once all CSSStyleValues DCHECK(result);
// support toCSSValue().
if (!result) {
exception_state.ThrowTypeError(
"Some CSSMathValues can't be serialized yet. See crbug.com/803739");
return "";
}
return result->CssText(); return result->CssText();
} }
......
third_party/WebKit/Source/core/css/cssom/CSSStyleValue.h
View file @ 3ce9c7d3
...@@ -70,7 +70,7 @@ class CORE_EXPORT CSSStyleValue : public ScriptWrappable { ...@@ -70,7 +70,7 @@ class CORE_EXPORT CSSStyleValue : public ScriptWrappable {
virtual const CSSValue* ToCSSValueWithProperty(CSSPropertyID) const { virtual const CSSValue* ToCSSValueWithProperty(CSSPropertyID) const {
return ToCSSValue(); return ToCSSValue();
} }
virtual String toString(ExceptionState&) const; virtual String toString() const;
protected: protected:
static String StyleValueTypeToString(StyleValueType); static String StyleValueTypeToString(StyleValueType);
......
third_party/WebKit/Source/core/css/cssom/CSSStyleValue.idl
View file @ 3ce9c7d3
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
[ [
Exposed(Window CSSTypedOM, PaintWorklet CSSPaintAPI) Exposed(Window CSSTypedOM, PaintWorklet CSSPaintAPI)
] interface CSSStyleValue { ] interface CSSStyleValue {
[RaisesException] stringifier; stringifier;
// Putting Exposed=Window in the next line makes |parse| not exposed to PaintWorklet. // Putting Exposed=Window in the next line makes |parse| not exposed to PaintWorklet.
[RaisesException, Exposed=Window, CallWith=ExecutionContext] static CSSStyleValue? parse(DOMString property, DOMString cssText); [RaisesException, Exposed=Window, CallWith=ExecutionContext] static CSSStyleValue? parse(DOMString property, DOMString cssText);
[RaisesException, Exposed=Window, CallWith=ExecutionContext] static sequence<CSSStyleValue>? parseAll(DOMString property, DOMString cssText); [RaisesException, Exposed=Window, CallWith=ExecutionContext] static sequence<CSSStyleValue>? parseAll(DOMString property, DOMString cssText);
......
third_party/WebKit/Source/core/css/cssom/CSSUnitValue.cpp
View file @ 3ce9c7d3
...@@ -160,4 +160,10 @@ CSSNumericValue* CSSUnitValue::Invert() { ...@@ -160,4 +160,10 @@ CSSNumericValue* CSSUnitValue::Invert() {
return CSSMathInvert::Create(this); return CSSMathInvert::Create(this);
} }
void CSSUnitValue::BuildCSSText(Nested,
ParenLess,
StringBuilder& result) const {
result.Append(ToCSSValue()->CssText());
}
} // namespace blink } // namespace blink
third_party/WebKit/Source/core/css/cssom/CSSUnitValue.h
View file @ 3ce9c7d3
...@@ -62,6 +62,8 @@ class CORE_EXPORT CSSUnitValue final : public CSSNumericValue { ...@@ -62,6 +62,8 @@ class CORE_EXPORT CSSUnitValue final : public CSSNumericValue {
double ConvertFixedLength(CSSPrimitiveValue::UnitType) const; double ConvertFixedLength(CSSPrimitiveValue::UnitType) const;
double ConvertAngle(CSSPrimitiveValue::UnitType) const; double ConvertAngle(CSSPrimitiveValue::UnitType) const;
void BuildCSSText(Nested, ParenLess, StringBuilder&) const final;
// From CSSNumericValue // From CSSNumericValue
CSSNumericValue* Negate() final; CSSNumericValue* Negate() final;
CSSNumericValue* Invert() final; CSSNumericValue* Invert() final;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment