Skip to content

Commit 2b9c828

Browse files
yezhizhenPotatoCP
authored andcommitted
embedder: Remove Int variant from WebDriverJSValue (servo#38748)
According to [spec](https://w3c.github.io/webdriver/#dfn-json-deserialize), we should only care about [Number](https://262.ecma-international.org/5.1/#sec-4.3.19) that is f64. This change also closes the gap between `JSValue` and `WebDriverJSValue` and potentially merge into one in the future. Testing: No regression. However, we have lots of TIMEOUT due to servo#38622. Signed-off-by: Euclid Ye <[email protected]>
1 parent c268788 commit 2b9c828

File tree

4 files changed

+1
-11
lines changed

4 files changed

+1
-11
lines changed

components/script/webdriver_handlers.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -369,14 +369,7 @@ unsafe fn jsval_to_webdriver_inner(
369369
Ok(WebDriverJSValue::Null)
370370
} else if val.get().is_boolean() {
371371
Ok(WebDriverJSValue::Boolean(val.get().to_boolean()))
372-
} else if val.get().is_int32() {
373-
Ok(WebDriverJSValue::Int(
374-
match FromJSValConvertible::from_jsval(cx, val, ConversionBehavior::Default).unwrap() {
375-
ConversionResult::Success(c) => c,
376-
_ => unreachable!(),
377-
},
378-
))
379-
} else if val.get().is_double() {
372+
} else if val.get().is_number() {
380373
Ok(WebDriverJSValue::Number(
381374
match FromJSValConvertible::from_jsval(cx, val, ()).unwrap() {
382375
ConversionResult::Success(c) => c,

components/shared/embedder/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,6 @@ impl From<&WebDriverJSValue> for JSValue {
10091009
WebDriverJSValue::Undefined => Self::Undefined,
10101010
WebDriverJSValue::Null => Self::Null,
10111011
WebDriverJSValue::Boolean(value) => Self::Boolean(*value),
1012-
WebDriverJSValue::Int(value) => Self::Number(*value as f64),
10131012
WebDriverJSValue::Number(value) => Self::Number(*value),
10141013
WebDriverJSValue::String(value) => Self::String(value.clone()),
10151014
WebDriverJSValue::Element(web_element) => Self::Element(web_element.0.clone()),

components/shared/embedder/webdriver.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ pub enum WebDriverJSValue {
259259
Undefined,
260260
Null,
261261
Boolean(bool),
262-
Int(i32),
263262
Number(f64),
264263
String(String),
265264
Element(WebElement),

components/webdriver_server/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ impl Serialize for SendableWebDriverJSValue {
305305
WebDriverJSValue::Undefined => serializer.serialize_unit(),
306306
WebDriverJSValue::Null => serializer.serialize_unit(),
307307
WebDriverJSValue::Boolean(x) => serializer.serialize_bool(x),
308-
WebDriverJSValue::Int(x) => serializer.serialize_i32(x),
309308
WebDriverJSValue::Number(x) => serializer.serialize_f64(x),
310309
WebDriverJSValue::String(ref x) => serializer.serialize_str(x),
311310
WebDriverJSValue::Element(ref x) => x.serialize(serializer),

0 commit comments

Comments
 (0)