summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/css/css_math_expression_node.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-09-03 13:32:17 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-10-01 14:31:55 +0200
commit21ba0c5d4bf8fba15dddd97cd693bad2358b77fd (patch)
tree91be119f694044dfc1ff9fdc054459e925de9df0 /chromium/third_party/blink/renderer/core/css/css_math_expression_node.h
parent03c549e0392f92c02536d3f86d5e1d8dfa3435ac (diff)
downloadqtwebengine-chromium-21ba0c5d4bf8fba15dddd97cd693bad2358b77fd.tar.gz
BASELINE: Update Chromium to 92.0.4515.166
Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364
Diffstat (limited to 'chromium/third_party/blink/renderer/core/css/css_math_expression_node.h')
-rw-r--r--chromium/third_party/blink/renderer/core/css/css_math_expression_node.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/chromium/third_party/blink/renderer/core/css/css_math_expression_node.h b/chromium/third_party/blink/renderer/core/css/css_math_expression_node.h
index 72ea6d1f5e2..ddb239ef8a3 100644
--- a/chromium/third_party/blink/renderer/core/css/css_math_expression_node.h
+++ b/chromium/third_party/blink/renderer/core/css/css_math_expression_node.h
@@ -31,6 +31,7 @@
#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSS_MATH_EXPRESSION_NODE_H_
#define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_CSS_MATH_EXPRESSION_NODE_H_
+#include "base/dcheck_is_on.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/css/css_math_operator.h"
#include "third_party/blink/renderer/core/css/css_primitive_value.h"
@@ -90,10 +91,10 @@ class CORE_EXPORT CSSMathExpressionNode
CSSPrimitiveValue::LengthTypeFlags& types) const = 0;
virtual scoped_refptr<const CalculationExpressionNode>
ToCalculationExpression(const CSSToLengthConversionData&) const = 0;
- virtual base::Optional<PixelsAndPercent> ToPixelsAndPercent(
+ virtual absl::optional<PixelsAndPercent> ToPixelsAndPercent(
const CSSToLengthConversionData&) const = 0;
- scoped_refptr<CalculationValue> ToCalcValue(
+ scoped_refptr<const CalculationValue> ToCalcValue(
const CSSToLengthConversionData& conversion_data,
ValueRange range,
bool allows_negative_percentage_reference) const;
@@ -108,7 +109,7 @@ class CORE_EXPORT CSSMathExpressionNode
// - A type conversion that doesn't have a fixed conversion ratio is needed
// (e.g., between 'px' and 'em').
// - There's an unsupported calculation, e.g., dividing two lengths.
- virtual base::Optional<double> ComputeValueInCanonicalUnit() const = 0;
+ virtual absl::optional<double> ComputeValueInCanonicalUnit() const = 0;
virtual String CustomCSSText() const = 0;
virtual bool operator==(const CSSMathExpressionNode& other) const {
@@ -180,10 +181,10 @@ class CORE_EXPORT CSSMathExpressionNumericLiteral final
String CustomCSSText() const final;
scoped_refptr<const CalculationExpressionNode> ToCalculationExpression(
const CSSToLengthConversionData&) const final;
- base::Optional<PixelsAndPercent> ToPixelsAndPercent(
+ absl::optional<PixelsAndPercent> ToPixelsAndPercent(
const CSSToLengthConversionData&) const final;
double DoubleValue() const final;
- base::Optional<double> ComputeValueInCanonicalUnit() const final;
+ absl::optional<double> ComputeValueInCanonicalUnit() const final;
double ComputeLengthPx(
const CSSToLengthConversionData& conversion_data) const final;
bool AccumulateLengthArray(CSSLengthArray& length_array,
@@ -237,10 +238,10 @@ class CORE_EXPORT CSSMathExpressionBinaryOperation final
bool IsZero() const final;
scoped_refptr<const CalculationExpressionNode> ToCalculationExpression(
const CSSToLengthConversionData&) const final;
- base::Optional<PixelsAndPercent> ToPixelsAndPercent(
+ absl::optional<PixelsAndPercent> ToPixelsAndPercent(
const CSSToLengthConversionData&) const final;
double DoubleValue() const final;
- base::Optional<double> ComputeValueInCanonicalUnit() const final;
+ absl::optional<double> ComputeValueInCanonicalUnit() const final;
double ComputeLengthPx(
const CSSToLengthConversionData& conversion_data) const final;
bool AccumulateLengthArray(CSSLengthArray& length_array,
@@ -306,7 +307,7 @@ class CSSMathExpressionVariadicOperation final : public CSSMathExpressionNode {
String CustomCSSText() const final;
scoped_refptr<const CalculationExpressionNode> ToCalculationExpression(
const CSSToLengthConversionData&) const final;
- base::Optional<PixelsAndPercent> ToPixelsAndPercent(
+ absl::optional<PixelsAndPercent> ToPixelsAndPercent(
const CSSToLengthConversionData&) const final;
double DoubleValue() const final;
double ComputeLengthPx(
@@ -315,7 +316,7 @@ class CSSMathExpressionVariadicOperation final : public CSSMathExpressionNode {
double multiplier) const final;
void AccumulateLengthUnitTypes(
CSSPrimitiveValue::LengthTypeFlags& types) const final;
- base::Optional<double> ComputeValueInCanonicalUnit() const final;
+ absl::optional<double> ComputeValueInCanonicalUnit() const final;
bool IsComputationallyIndependent() const final;
bool operator==(const CSSMathExpressionNode& other) const final;
CSSPrimitiveValue::UnitType ResolvedUnitType() const final;