Rename SVGAnimatedPropertyBase::SetBaseValueAsString
Rename SVGAnimatedPropertyBase::SetBaseValueAsString to
AttributeChanged, to reflect how it interacts with the system in general
(sets a new value based on an updated attribute string) - the counter-
part to this notifier being BaseValueChanged.
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I55b42d7662c744d4d4d39b8ea0545d0318bcbeab
Reviewed-on: https://chromium-review.googlesource.com/1184844
Reviewed-by: Philip Rogers <pdr@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#585077}diff --git a/third_party/blink/renderer/core/svg/properties/svg_animated_property.h b/third_party/blink/renderer/core/svg/properties/svg_animated_property.h
index cebc35b..349b8b8 100644
--- a/third_party/blink/renderer/core/svg/properties/svg_animated_property.h
+++ b/third_party/blink/renderer/core/svg/properties/svg_animated_property.h
@@ -57,7 +57,7 @@
virtual void SetAnimatedValue(SVGPropertyBase*) = 0;
virtual void AnimationEnded();
- virtual SVGParsingError SetBaseValueAsString(const String&) = 0;
+ virtual SVGParsingError AttributeChanged(const String&) = 0;
virtual bool NeedsSynchronizeAttribute() = 0;
virtual void SynchronizeAttribute();
@@ -123,7 +123,7 @@
bool IsAnimating() const override { return current_value_; }
- SVGParsingError SetBaseValueAsString(const String& value) override {
+ SVGParsingError AttributeChanged(const String& value) override {
return base_value_->SetValueAsString(value);
}
diff --git a/third_party/blink/renderer/core/svg/svg_animated_length.cc b/third_party/blink/renderer/core/svg/svg_animated_length.cc
index b44a605e..e1d5587 100644
--- a/third_party/blink/renderer/core/svg/svg_animated_length.cc
+++ b/third_party/blink/renderer/core/svg/svg_animated_length.cc
@@ -38,8 +38,9 @@
BaseValue()->SetValueAsString(value);
}
-SVGParsingError SVGAnimatedLength::SetBaseValueAsString(const String& value) {
- SVGParsingError parse_status = BaseValue()->SetValueAsString(value);
+SVGParsingError SVGAnimatedLength::AttributeChanged(const String& value) {
+ SVGParsingError parse_status =
+ SVGAnimatedProperty<SVGLength>::AttributeChanged(value);
if (parse_status != SVGParseStatus::kNoError)
BaseValue()->NewValueSpecifiedUnits(CSSPrimitiveValue::UnitType::kUserUnits,
diff --git a/third_party/blink/renderer/core/svg/svg_animated_length.h b/third_party/blink/renderer/core/svg/svg_animated_length.h
index eab3f9780..9384ee5 100644
--- a/third_party/blink/renderer/core/svg/svg_animated_length.h
+++ b/third_party/blink/renderer/core/svg/svg_animated_length.h
@@ -53,7 +53,7 @@
}
void SetDefaultValueAsString(const String&);
- SVGParsingError SetBaseValueAsString(const String&) override;
+ SVGParsingError AttributeChanged(const String&) override;
const CSSValue& CssValue() const {
return CurrentValue()->AsCSSPrimitiveValue();
diff --git a/third_party/blink/renderer/core/svg/svg_element.cc b/third_party/blink/renderer/core/svg/svg_element.cc
index 08f653c..8f49111f 100644
--- a/third_party/blink/renderer/core/svg/svg_element.cc
+++ b/third_party/blink/renderer/core/svg/svg_element.cc
@@ -679,8 +679,7 @@
// Element::ParseAttribute). We don't tell Element about the change to avoid
// parsing the class list twice.
if (SVGAnimatedPropertyBase* property = PropertyFromAttribute(params.name)) {
- SVGParsingError parse_error =
- property->SetBaseValueAsString(params.new_value);
+ SVGParsingError parse_error = property->AttributeChanged(params.new_value);
ReportAttributeParsingError(parse_error, params.name, params.new_value);
return;
}
diff --git a/third_party/blink/renderer/core/svg/svg_fe_convolve_matrix_element.cc b/third_party/blink/renderer/core/svg/svg_fe_convolve_matrix_element.cc
index 63170c4..0536c88 100644
--- a/third_party/blink/renderer/core/svg/svg_fe_convolve_matrix_element.cc
+++ b/third_party/blink/renderer/core/svg/svg_fe_convolve_matrix_element.cc
@@ -44,7 +44,7 @@
return new SVGAnimatedOrder(context_element);
}
- SVGParsingError SetBaseValueAsString(const String&) override;
+ SVGParsingError AttributeChanged(const String&) override;
protected:
SVGAnimatedOrder(SVGElement* context_element)
@@ -64,9 +64,9 @@
}
};
-SVGParsingError SVGAnimatedOrder::SetBaseValueAsString(const String& value) {
+SVGParsingError SVGAnimatedOrder::AttributeChanged(const String& value) {
SVGParsingError parse_status =
- SVGAnimatedIntegerOptionalInteger::SetBaseValueAsString(value);
+ SVGAnimatedIntegerOptionalInteger::AttributeChanged(value);
// Check for semantic errors.
parse_status = CheckValue(parse_status, FirstInteger()->BaseValue()->Value());
parse_status =
diff --git a/third_party/blink/renderer/core/svg/svg_fit_to_view_box.cc b/third_party/blink/renderer/core/svg/svg_fit_to_view_box.cc
index 7328b6e..4fab9310 100644
--- a/third_party/blink/renderer/core/svg/svg_fit_to_view_box.cc
+++ b/third_party/blink/renderer/core/svg/svg_fit_to_view_box.cc
@@ -35,16 +35,15 @@
return new SVGAnimatedViewBoxRect(context_element);
}
- SVGParsingError SetBaseValueAsString(const String&) override;
+ SVGParsingError AttributeChanged(const String&) override;
protected:
SVGAnimatedViewBoxRect(SVGElement* context_element)
: SVGAnimatedRect(context_element, SVGNames::viewBoxAttr) {}
};
-SVGParsingError SVGAnimatedViewBoxRect::SetBaseValueAsString(
- const String& value) {
- SVGParsingError parse_status = SVGAnimatedRect::SetBaseValueAsString(value);
+SVGParsingError SVGAnimatedViewBoxRect::AttributeChanged(const String& value) {
+ SVGParsingError parse_status = SVGAnimatedRect::AttributeChanged(value);
if (parse_status == SVGParseStatus::kNoError &&
(BaseValue()->Width() < 0 || BaseValue()->Height() < 0)) {
diff --git a/third_party/blink/renderer/core/svg/svg_geometry_element.cc b/third_party/blink/renderer/core/svg/svg_geometry_element.cc
index 97ee5aae..7096142 100644
--- a/third_party/blink/renderer/core/svg/svg_geometry_element.cc
+++ b/third_party/blink/renderer/core/svg/svg_geometry_element.cc
@@ -46,9 +46,8 @@
return new SVGAnimatedPathLength(context_element);
}
- SVGParsingError SetBaseValueAsString(const String& value) override {
- SVGParsingError parse_status =
- SVGAnimatedNumber::SetBaseValueAsString(value);
+ SVGParsingError AttributeChanged(const String& value) override {
+ SVGParsingError parse_status = SVGAnimatedNumber::AttributeChanged(value);
if (parse_status == SVGParseStatus::kNoError && BaseValue()->Value() < 0)
parse_status = SVGParseStatus::kNegativeValue;
return parse_status;
diff --git a/third_party/blink/renderer/core/svg/svg_static_string_list.cc b/third_party/blink/renderer/core/svg/svg_static_string_list.cc
index 1e52b9b..cd72912 100644
--- a/third_party/blink/renderer/core/svg/svg_static_string_list.cc
+++ b/third_party/blink/renderer/core/svg/svg_static_string_list.cc
@@ -89,7 +89,7 @@
return tear_off_.Get();
}
-SVGParsingError SVGStaticStringList::SetBaseValueAsString(const String& value) {
+SVGParsingError SVGStaticStringList::AttributeChanged(const String& value) {
return value_->SetValueAsString(value);
}
diff --git a/third_party/blink/renderer/core/svg/svg_static_string_list.h b/third_party/blink/renderer/core/svg/svg_static_string_list.h
index 2298ebe0f..b37f591 100644
--- a/third_party/blink/renderer/core/svg/svg_static_string_list.h
+++ b/third_party/blink/renderer/core/svg/svg_static_string_list.h
@@ -64,7 +64,7 @@
void AnimationEnded() override;
bool NeedsSynchronizeAttribute() override;
- SVGParsingError SetBaseValueAsString(const String&) override;
+ SVGParsingError AttributeChanged(const String&) override;
SVGStringList* Value() { return value_.Get(); }
SVGStringListTearOff* TearOff();
diff --git a/third_party/blink/renderer/core/svg/svg_svg_element.cc b/third_party/blink/renderer/core/svg/svg_svg_element.cc
index bf00d67..7a43561 100644
--- a/third_party/blink/renderer/core/svg/svg_svg_element.cc
+++ b/third_party/blink/renderer/core/svg/svg_svg_element.cc
@@ -199,7 +199,7 @@
name == SVGNames::widthAttr ? width_ : height_;
SVGParsingError parse_error;
if (!value.IsNull())
- parse_error = property->SetBaseValueAsString(value);
+ parse_error = property->AttributeChanged(value);
if (parse_error != SVGParseStatus::kNoError || value.IsNull())
property->SetDefaultValueAsString("100%");
ReportAttributeParsingError(parse_error, name, value);
