Commit 2996f0e6 authored by Anders Hartvoll Ruud's avatar Anders Hartvoll Ruud Committed by Commit Bot

Remove CSSVariableData::absolutized_

This flag is an remnant of the old way of resolving variables, and is
no longer needed.

Change-Id: I5f013b65b3fd2a653cbb98846689b0e00c48046a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2306089
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Reviewed-by: default avatarXiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790332}
parent 3130c0a6
......@@ -83,7 +83,6 @@ CSSVariableData::CSSVariableData(const CSSParserTokenRange& range,
needs_variable_resolution_(needs_variable_resolution),
has_font_units_(false),
has_root_font_units_(false),
absolutized_(false),
base_url_(base_url.IsValid() ? base_url.GetString() : String()),
charset_(charset) {
DCHECK(!range.AtEnd());
......
......@@ -43,12 +43,11 @@ class CORE_EXPORT CSSVariableData : public RefCounted<CSSVariableData> {
bool is_animation_tainted,
bool has_font_units,
bool has_root_font_units,
bool absolutized,
const String& base_url,
const WTF::TextEncoding& charset) {
return base::AdoptRef(new CSSVariableData(
resolved_tokens, std::move(backing_strings), is_animation_tainted,
has_font_units, has_root_font_units, absolutized, base_url, charset));
has_font_units, has_root_font_units, base_url, charset));
}
CSSParserTokenRange TokenRange() const { return tokens_; }
......@@ -70,10 +69,6 @@ class CORE_EXPORT CSSVariableData : public RefCounted<CSSVariableData> {
// font-size of the root element, e.g. 'rem'.
bool HasRootFontUnits() const { return has_root_font_units_; }
// True if this CSSVariableData has undergone absolutization. Absolutization
// is required for e.g. registered properties with 'em' units.
bool IsAbsolutized() const { return absolutized_; }
const String& BaseURL() const { return base_url_; }
const WTF::TextEncoding& Charset() const { return charset_; }
......@@ -86,8 +81,7 @@ class CORE_EXPORT CSSVariableData : public RefCounted<CSSVariableData> {
: is_animation_tainted_(false),
needs_variable_resolution_(false),
has_font_units_(false),
has_root_font_units_(false),
absolutized_(false) {}
has_root_font_units_(false) {}
CSSVariableData(const CSSParserTokenRange&,
bool is_animation_tainted,
......@@ -100,7 +94,6 @@ class CORE_EXPORT CSSVariableData : public RefCounted<CSSVariableData> {
bool is_animation_tainted,
bool has_font_units,
bool has_root_font_units,
bool absolutized,
const String& base_url,
const WTF::TextEncoding& charset)
: backing_strings_(std::move(backing_strings)),
......@@ -109,7 +102,6 @@ class CORE_EXPORT CSSVariableData : public RefCounted<CSSVariableData> {
needs_variable_resolution_(false),
has_font_units_(has_font_units),
has_root_font_units_(has_root_font_units),
absolutized_(absolutized),
base_url_(base_url),
charset_(charset) {}
......@@ -124,7 +116,6 @@ class CORE_EXPORT CSSVariableData : public RefCounted<CSSVariableData> {
const bool needs_variable_resolution_;
bool has_font_units_;
bool has_root_font_units_;
bool absolutized_;
String base_url_;
WTF::TextEncoding charset_;
DISALLOW_COPY_AND_ASSIGN(CSSVariableData);
......
......@@ -1974,11 +1974,10 @@ StyleBuilderConverter::ConvertRegisteredPropertyVariableData(
const bool has_font_units = false;
const bool has_root_font_units = false;
const bool absolutized = true;
return CSSVariableData::CreateResolved(
tokens, std::move(backing_strings), is_animation_tainted, has_font_units,
has_root_font_units, absolutized, g_null_atom, WTF::TextEncoding());
has_root_font_units, g_null_atom, WTF::TextEncoding());
}
LengthSize StyleBuilderConverter::ConvertIntrinsicSize(
......
......@@ -531,10 +531,9 @@ void StyleCascade::TokenSequence::Append(const CSSParserToken& token) {
scoped_refptr<CSSVariableData>
StyleCascade::TokenSequence::BuildVariableData() {
// TODO(andruud): Why not also std::move tokens?
const bool absolutized = true;
return CSSVariableData::CreateResolved(
tokens_, std::move(backing_strings_), is_animation_tainted_,
has_font_units_, has_root_font_units_, absolutized, base_url_, charset_);
has_font_units_, has_root_font_units_, base_url_, charset_);
}
bool StyleCascade::ShouldRevert(const CSSProperty& property,
......
......@@ -153,7 +153,7 @@ void StyleEnvironmentVariables::SetVariable(const AtomicString& name,
CSSVariableData::CreateResolved(
tokens, backing_strings, false /* is_animation_tainted */,
false /* has_font_units */, false /* has_root_font_units*/,
true /* absolutized */, g_null_atom, WTF::TextEncoding()));
g_null_atom, WTF::TextEncoding()));
}
void StyleEnvironmentVariables::SetVariable(const UADefinedVariable name,
......
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