Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-27 23:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement indexeddb array conversion (#38288)

Browse source 
Implement conversion from js arrays into rust.

Testing: WPT
Fixes: None

---------

Signed-off-by: Ashwin Naren <arihant2math@gmail.com>
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Co-authored-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Ashwin Naren 2025-09-19 23:33:16 -07:00 • committed by GitHub
parent 8590c4edcf
commit 8a59c2cf56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 98 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

55
components/script/indexed_db.rs
View file

@ -11,12 +11,13 @@ use itertools::Itertools;
use js::conversions::jsstr_to_string;
use js::gc::MutableHandle;
use js::jsapi::{
ClippedTime, ESClass, GetBuiltinClass, IsArrayBufferObject, JS_GetStringLength,
JS_IsArrayBufferViewObject, JS_NewObject, NewDateObject,
ClippedTime, ESClass, GetArrayLength, GetBuiltinClass, IsArrayBufferObject, JS_GetStringLength,
JS_HasOwnPropertyById, JS_IndexToId, JS_IsArrayBufferViewObject, JS_NewObject, NewDateObject,
PropertyKey,
};
use js::jsval::{DoubleValue, UndefinedValue};
use js::rust::wrappers::{IsArrayObject, JS_GetProperty, JS_HasOwnProperty, JS_IsIdentifier};
use js::rust::{HandleValue, MutableHandleValue};
use js::rust::{HandleValue, IntoHandle, IntoMutableHandle, MutableHandleValue};
use net_traits::indexeddb_thread::{BackendResult, IndexedDBKeyRange, IndexedDBKeyType};
use profile_traits::ipc;
use profile_traits::ipc::IpcReceiver;
@ -158,7 +159,7 @@ pub fn convert_value_to_key(
seen: Option<Vec<HandleValue>>,
) -> Result<ConversionResult, Error> {
// Step 1: If seen was not given, then let seen be a new empty set.
let _seen = seen.unwrap_or_default();
let mut seen = seen.unwrap_or_default();
// Step 2: If seen contains input, then return invalid.
// FIXME:(arihant2math) implement this
@ -189,13 +190,13 @@ pub fn convert_value_to_key(
let mut built_in_class = ESClass::Other;
if !GetBuiltinClass(*cx, object.handle().into(), &mut built_in_class) {
return Err(Error::Data);
return Err(Error::JSFailed);
}
if let ESClass::Date = built_in_class {
let mut f = f64::NAN;
if !js::jsapi::DateGetMsecSinceEpoch(*cx, object.handle().into(), &mut f) {
return Err(Error::Data);
return Err(Error::JSFailed);
}
if f.is_nan() {
return Err(Error::Data);
@ -212,9 +213,45 @@ pub fn convert_value_to_key(
}
if let ESClass::Array = built_in_class {
// FIXME:(arihant2math)
error!("Arrays as keys is currently unsupported");
return Err(Error::NotSupported);
let mut len = 0;
if !GetArrayLength(*cx, object.handle().into_handle(), &mut len) {
return Err(Error::JSFailed);
}
seen.push(input);
let mut values = vec![];
for i in 0..len {
rooted!(in(*cx) let mut id: PropertyKey);
if !JS_IndexToId(*cx, i, js::jsapi::MutableHandleId::from(id.handle_mut())) {
return Err(Error::JSFailed);
}
let mut has_own = false;
if !JS_HasOwnPropertyById(
*cx,
object.handle().into_handle(),
id.handle().into_handle(),
&mut has_own,
) {
return Err(Error::JSFailed);
}
if !has_own {
return Ok(ConversionResult::Invalid);
}
rooted!(in(*cx) let mut item = UndefinedValue());
if !js::jsapi::JS_GetPropertyById(
*cx,
object.handle().into_handle(),
id.handle().into_handle(),
item.handle_mut().into_handle_mut(),
) {
return Err(Error::JSFailed);
}
let key = match convert_value_to_key(cx, item.handle(), Some(seen.clone()))? {
ConversionResult::Valid(key) => key,
ConversionResult::Invalid => return Ok(ConversionResult::Invalid),
};
values.push(key);
}
return Ok(ConversionResult::Valid(IndexedDBKeyType::Array(values)));
}
}
}