mirror of
https://github.com/servo/servo.git
synced 2025-06-08 16:43:28 +00:00
3cf4ef61ef
#30151 added support for setlike and maplike declarations in WebIDL, but the tests only validated if generator code worked with 'DOMString' as the key type. The support for interface type as members was broken as `DomRoot<T>` didn't satify the bounds `Eq` and `Hash` needed by the `Key` and `Value` types in `Setlike` and `Maplike` traits respectively. In addition, the splitting of bindings into a separate 'script_bindings' crate had also broken support for this in CodegenRust.py, as the types used within the definition of `DomTraits` were not referenced using `Self::`. This patch fixes the WebIDL code generator by doing a simple string replacement on the return value of `getRetvalDeclarationForType` so that the proper `Self::` is used. I'm not not sure if there is a better approach to this as it seems most logic in CodegenRust.py uses the `D::` prefix that is expected to be available only when compiling `script` crate and not `script_bindings`. This patch also adds the missing trait implementations for `DomRoot` and ensures that the generated code works for both members of primitive and interface types by splitting the existing `TestBinding{Map,Set}Like` interfaces into `TestBinding{Map,Set}LikeWith{Primitive,Interface}` tests. Fixes #35542. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
100 lines
3 KiB
Rust
100 lines
3 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
// check-tidy: no specs after this line
|
|
|
|
use dom_struct::dom_struct;
|
|
use indexmap::IndexMap;
|
|
use js::rust::HandleObject;
|
|
|
|
use super::bindings::error::Error;
|
|
use crate::dom::bindings::cell::DomRefCell;
|
|
use crate::dom::bindings::codegen::Bindings::TestBindingMaplikeWithInterfaceBinding::TestBindingMaplikeWithInterfaceMethods;
|
|
use crate::dom::bindings::error::Fallible;
|
|
use crate::dom::bindings::like::Maplike;
|
|
use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector};
|
|
use crate::dom::bindings::root::DomRoot;
|
|
use crate::dom::bindings::str::DOMString;
|
|
use crate::dom::globalscope::GlobalScope;
|
|
use crate::dom::testbinding::TestBinding;
|
|
use crate::maplike;
|
|
use crate::script_runtime::CanGc;
|
|
|
|
/// maplike<DOMString, TestBinding>
|
|
#[dom_struct]
|
|
pub(crate) struct TestBindingMaplikeWithInterface {
|
|
reflector: Reflector,
|
|
#[custom_trace]
|
|
internal: DomRefCell<IndexMap<DOMString, DomRoot<TestBinding>>>,
|
|
}
|
|
|
|
impl TestBindingMaplikeWithInterface {
|
|
fn new(
|
|
global: &GlobalScope,
|
|
proto: Option<HandleObject>,
|
|
can_gc: CanGc,
|
|
) -> DomRoot<TestBindingMaplikeWithInterface> {
|
|
reflect_dom_object_with_proto(
|
|
Box::new(TestBindingMaplikeWithInterface {
|
|
reflector: Reflector::new(),
|
|
internal: DomRefCell::new(IndexMap::new()),
|
|
}),
|
|
global,
|
|
proto,
|
|
can_gc,
|
|
)
|
|
}
|
|
}
|
|
|
|
impl TestBindingMaplikeWithInterfaceMethods<crate::DomTypeHolder>
|
|
for TestBindingMaplikeWithInterface
|
|
{
|
|
fn Constructor(
|
|
global: &GlobalScope,
|
|
proto: Option<HandleObject>,
|
|
can_gc: CanGc,
|
|
) -> Fallible<DomRoot<TestBindingMaplikeWithInterface>> {
|
|
Ok(TestBindingMaplikeWithInterface::new(global, proto, can_gc))
|
|
}
|
|
|
|
fn SetInternal(&self, key: DOMString, value: &TestBinding) {
|
|
let value = DomRoot::from_ref(value);
|
|
self.internal.set(key, value)
|
|
}
|
|
|
|
fn ClearInternal(&self) {
|
|
self.internal.clear()
|
|
}
|
|
|
|
fn DeleteInternal(&self, key: DOMString) -> bool {
|
|
self.internal.delete(key)
|
|
}
|
|
|
|
fn HasInternal(&self, key: DOMString) -> bool {
|
|
self.internal.has(key)
|
|
}
|
|
|
|
fn GetInternal(&self, key: DOMString) -> Fallible<DomRoot<TestBinding>> {
|
|
// TODO: error type?
|
|
self.internal
|
|
.borrow()
|
|
.get(&key)
|
|
.ok_or_else(|| Error::Type(format!("No entry for key {key}")))
|
|
.cloned()
|
|
}
|
|
|
|
fn Size(&self) -> u32 {
|
|
self.internal.size()
|
|
}
|
|
}
|
|
|
|
// this error is wrong because if we inline Self::Key and Self::Value all errors are gone
|
|
// TODO: FIX THIS
|
|
#[cfg_attr(crown, allow(crown::unrooted_must_root))]
|
|
impl Maplike for TestBindingMaplikeWithInterface {
|
|
type Key = DOMString;
|
|
type Value = DomRoot<TestBinding>;
|
|
|
|
maplike!(self, internal);
|
|
}
|