mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
fix: Implement additional logic in DOMString::set_best_representation_of_the_floating_point_number in order to correct some failing tests related to -0 values. (#32272)
This commit is contained in:
shanehandley
GitHub
parent
3d4fd0e550
commit
8eeb888010
6 changed files with 67 additions and 74 deletions
|
|
@ -16,6 +16,7 @@ use chrono::{Datelike, TimeZone};
|
|||
use cssparser::CowRcStr;
|
||||
use html5ever::{LocalName, Namespace};
|
||||
use lazy_static::lazy_static;
|
||||
use num_traits::Zero;
|
||||
use regex::Regex;
|
||||
use servo_atoms::Atom;
|
||||
|
||||
|
|
@ -456,10 +457,20 @@ impl DOMString {
|
|||
None
|
||||
}
|
||||
|
||||
/// Applies the same processing as `parse_floating_point_number` with some additional handling
|
||||
/// according to ECMA's string conversion steps.
|
||||
///
|
||||
/// Used for specific elements when handling floating point values, namely the `number` and
|
||||
/// `range` inputs, as well as `meter` and `progress` elements.
|
||||
///
|
||||
/// <https://html.spec.whatwg.org/multipage/#best-representation-of-the-number-as-a-floating-point-number>
|
||||
/// <https://tc39.es/ecma262/#sec-numeric-types-number-tostring>
|
||||
pub fn set_best_representation_of_the_floating_point_number(&mut self) {
|
||||
if let Some(val) = self.parse_floating_point_number() {
|
||||
self.0 = val.to_string();
|
||||
// [tc39] Step 2: If x is either +0 or -0, return "0".
|
||||
let parsed_value = if val.is_zero() { 0.0_f64 } else { val };
|
||||
|
||||
self.0 = parsed_value.to_string()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2189,7 +2189,13 @@ impl HTMLInputElement {
|
|||
datetime.format("%Y-%m-%dT%H:%M:%S%.3f").to_string(),
|
||||
))
|
||||
},
|
||||
InputType::Number | InputType::Range => Ok(DOMString::from(value.to_string())),
|
||||
InputType::Number | InputType::Range => {
|
||||
let mut value = DOMString::from(value.to_string());
|
||||
|
||||
value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
Ok(value)
|
||||
},
|
||||
// this won't be called from other input types
|
||||
_ => unreachable!(),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLMeterElementBinding::HTMLMeterE
|
|||
use crate::dom::bindings::inheritance::Castable;
|
||||
use crate::dom::bindings::num::Finite;
|
||||
use crate::dom::bindings::root::{DomRoot, MutNullableDom};
|
||||
use crate::dom::bindings::str::DOMString;
|
||||
use crate::dom::document::Document;
|
||||
use crate::dom::element::Element;
|
||||
use crate::dom::htmlelement::HTMLElement;
|
||||
|
|
@ -75,8 +76,12 @@ impl HTMLMeterElementMethods for HTMLMeterElement {
|
|||
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-meter-value>
|
||||
fn SetValue(&self, value: Finite<f64>) {
|
||||
let mut string_value = DOMString::from_string((*value).to_string());
|
||||
|
||||
string_value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
self.upcast::<Element>()
|
||||
.set_string_attribute(&local_name!("value"), (*value).to_string().into());
|
||||
.set_string_attribute(&local_name!("value"), string_value);
|
||||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#concept-meter-minimum>
|
||||
|
|
@ -91,8 +96,12 @@ impl HTMLMeterElementMethods for HTMLMeterElement {
|
|||
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-meter-min>
|
||||
fn SetMin(&self, value: Finite<f64>) {
|
||||
let mut string_value = DOMString::from_string((*value).to_string());
|
||||
|
||||
string_value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
self.upcast::<Element>()
|
||||
.set_string_attribute(&local_name!("min"), (*value).to_string().into());
|
||||
.set_string_attribute(&local_name!("min"), string_value);
|
||||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#concept-meter-maximum>
|
||||
|
|
@ -108,8 +117,12 @@ impl HTMLMeterElementMethods for HTMLMeterElement {
|
|||
|
||||
/// <https://html.spec.whatwg.org/multipage/#concept-meter-maximum>
|
||||
fn SetMax(&self, value: Finite<f64>) {
|
||||
let mut string_value = DOMString::from_string((*value).to_string());
|
||||
|
||||
string_value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
self.upcast::<Element>()
|
||||
.set_string_attribute(&local_name!("max"), (*value).to_string().into());
|
||||
.set_string_attribute(&local_name!("max"), string_value);
|
||||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#concept-meter-low>
|
||||
|
|
@ -129,8 +142,12 @@ impl HTMLMeterElementMethods for HTMLMeterElement {
|
|||
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-meter-low>
|
||||
fn SetLow(&self, value: Finite<f64>) {
|
||||
let mut string_value = DOMString::from_string((*value).to_string());
|
||||
|
||||
string_value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
self.upcast::<Element>()
|
||||
.set_string_attribute(&local_name!("low"), (*value).to_string().into());
|
||||
.set_string_attribute(&local_name!("low"), string_value);
|
||||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#concept-meter-high>
|
||||
|
|
@ -154,8 +171,12 @@ impl HTMLMeterElementMethods for HTMLMeterElement {
|
|||
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-meter-high>
|
||||
fn SetHigh(&self, value: Finite<f64>) {
|
||||
let mut string_value = DOMString::from_string((*value).to_string());
|
||||
|
||||
string_value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
self.upcast::<Element>()
|
||||
.set_string_attribute(&local_name!("high"), (*value).to_string().into());
|
||||
.set_string_attribute(&local_name!("high"), string_value);
|
||||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#concept-meter-optimum>
|
||||
|
|
@ -175,7 +196,11 @@ impl HTMLMeterElementMethods for HTMLMeterElement {
|
|||
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-meter-optimum>
|
||||
fn SetOptimum(&self, value: Finite<f64>) {
|
||||
let mut string_value = DOMString::from_string((*value).to_string());
|
||||
|
||||
string_value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
self.upcast::<Element>()
|
||||
.set_string_attribute(&local_name!("optimum"), (*value).to_string().into());
|
||||
.set_string_attribute(&local_name!("optimum"), string_value);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ use crate::dom::bindings::codegen::Bindings::HTMLProgressElementBinding::HTMLPro
|
|||
use crate::dom::bindings::inheritance::Castable;
|
||||
use crate::dom::bindings::num::Finite;
|
||||
use crate::dom::bindings::root::{DomRoot, MutNullableDom};
|
||||
use crate::dom::bindings::str::DOMString;
|
||||
use crate::dom::document::Document;
|
||||
use crate::dom::element::Element;
|
||||
use crate::dom::htmlelement::HTMLElement;
|
||||
|
|
@ -75,11 +76,15 @@ impl HTMLProgressElementMethods for HTMLProgressElement {
|
|||
})
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-progress-value
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-progress-value>
|
||||
fn SetValue(&self, new_val: Finite<f64>) {
|
||||
if 0.0 <= *new_val {
|
||||
if *new_val >= 0.0 {
|
||||
let mut string_value = DOMString::from_string((*new_val).to_string());
|
||||
|
||||
string_value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
self.upcast::<Element>()
|
||||
.set_string_attribute(&local_name!("value"), (*new_val).to_string().into());
|
||||
.set_string_attribute(&local_name!("value"), string_value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -100,10 +105,16 @@ impl HTMLProgressElementMethods for HTMLProgressElement {
|
|||
})
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-progress-max
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-progress-max>
|
||||
fn SetMax(&self, new_val: Finite<f64>) {
|
||||
if *new_val > 0.0 {
|
||||
let mut string_value = DOMString::from_string((*new_val).to_string());
|
||||
|
||||
string_value.set_best_representation_of_the_floating_point_number();
|
||||
|
||||
self.upcast::<Element>()
|
||||
.set_string_attribute(&local_name!("max"), (*new_val).to_string().into());
|
||||
.set_string_attribute(&local_name!("max"), string_value);
|
||||
}
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-progress-position
|
||||
|
|
|
|||
|
|
@ -20181,39 +20181,21 @@
|
|||
[meter.value: IDL get with DOM attribute unset]
|
||||
expected: FAIL
|
||||
|
||||
[meter.value: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.min: IDL get with DOM attribute unset]
|
||||
expected: FAIL
|
||||
|
||||
[meter.min: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.max: IDL get with DOM attribute unset]
|
||||
expected: FAIL
|
||||
|
||||
[meter.max: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.low: IDL get with DOM attribute unset]
|
||||
expected: FAIL
|
||||
|
||||
[meter.low: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.high: IDL get with DOM attribute unset]
|
||||
expected: FAIL
|
||||
|
||||
[meter.high: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.optimum: IDL get with DOM attribute unset]
|
||||
expected: FAIL
|
||||
|
||||
[meter.optimum: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[optgroup.accessKey: setAttribute() to "5%"]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -20802,18 +20784,6 @@
|
|||
[progress.max: setAttribute() to "+100"]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to -10000000000]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to -1]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to 0]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to 1e-10]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -3380,24 +3380,6 @@
|
|||
[meter.tabIndex: IDL set to -2147483648]
|
||||
expected: FAIL
|
||||
|
||||
[meter.value: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.min: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.max: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.low: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.high: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[meter.optimum: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[form.tabIndex: setAttribute() to "7\\v"]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -3551,18 +3533,6 @@
|
|||
[progress.max: setAttribute() to "+100"]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to -10000000000]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to -1]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to -0]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to 0]
|
||||
expected: FAIL
|
||||
|
||||
[progress.max: IDL set to 1e-10]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue