mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
75eb94afca
I moved away from the `Window` struct all the logic to handle task sources, into a new struct called `TaskManager`. In a happy world, I'd be able to just have there two functions, of the types: ```rust fn task_source<T: TaskSource>(&self, name: TaskSourceName) -> Box<T> fn task_source_with_canceller<T: TaskSource>(&self, name: TaskSourceName) -> (Box<T>, TaskSourceCanceller) ``` And not so much duplicated code. However, because TaskSource can't be a trait object (because it has generic type parameters), that's not possible. Instead, I decided to reduce duplicated logic through macros. For reasons[1], I have to pass both the name of the function with canceller and the name of the function without, as I'm not able to concatenate them in the macro itself. I could probably use `concat_idents` to create both types already defined and reduce the amount of arguments by one, but that macro is nightly only. At the same time, not being able to declare macros inside `impl` forces me to pass `self` as an argument. All this makes this solution more verbose than it would be ideally. It does reduce duplication, but it doesn't reduce the size of the file. [1](https://github.com/rust-lang/rust/issues/29599)
97 lines
3.1 KiB
Rust
97 lines
3.1 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 http://mozilla.org/MPL/2.0/. */
|
|
|
|
use crate::dom::bindings::cell::DomRefCell;
|
|
use crate::dom::bindings::codegen::Bindings::HTMLDialogElementBinding;
|
|
use crate::dom::bindings::codegen::Bindings::HTMLDialogElementBinding::HTMLDialogElementMethods;
|
|
use crate::dom::bindings::inheritance::Castable;
|
|
use crate::dom::bindings::root::DomRoot;
|
|
use crate::dom::bindings::str::DOMString;
|
|
use crate::dom::document::Document;
|
|
use crate::dom::element::Element;
|
|
use crate::dom::eventtarget::EventTarget;
|
|
use crate::dom::htmlelement::HTMLElement;
|
|
use crate::dom::node::{window_from_node, Node};
|
|
use dom_struct::dom_struct;
|
|
use html5ever::{LocalName, Prefix};
|
|
|
|
#[dom_struct]
|
|
pub struct HTMLDialogElement {
|
|
htmlelement: HTMLElement,
|
|
return_value: DomRefCell<DOMString>,
|
|
}
|
|
|
|
impl HTMLDialogElement {
|
|
fn new_inherited(
|
|
local_name: LocalName,
|
|
prefix: Option<Prefix>,
|
|
document: &Document,
|
|
) -> HTMLDialogElement {
|
|
HTMLDialogElement {
|
|
htmlelement: HTMLElement::new_inherited(local_name, prefix, document),
|
|
return_value: DomRefCell::new(DOMString::new()),
|
|
}
|
|
}
|
|
|
|
#[allow(unrooted_must_root)]
|
|
pub fn new(
|
|
local_name: LocalName,
|
|
prefix: Option<Prefix>,
|
|
document: &Document,
|
|
) -> DomRoot<HTMLDialogElement> {
|
|
Node::reflect_node(
|
|
Box::new(HTMLDialogElement::new_inherited(
|
|
local_name, prefix, document,
|
|
)),
|
|
document,
|
|
HTMLDialogElementBinding::Wrap,
|
|
)
|
|
}
|
|
}
|
|
|
|
impl HTMLDialogElementMethods for HTMLDialogElement {
|
|
// https://html.spec.whatwg.org/multipage/#dom-dialog-open
|
|
make_bool_getter!(Open, "open");
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-dialog-open
|
|
make_bool_setter!(SetOpen, "open");
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-dialog-returnvalue
|
|
fn ReturnValue(&self) -> DOMString {
|
|
let return_value = self.return_value.borrow();
|
|
return_value.clone()
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-dialog-returnvalue
|
|
fn SetReturnValue(&self, return_value: DOMString) {
|
|
*self.return_value.borrow_mut() = return_value;
|
|
}
|
|
|
|
// https://html.spec.whatwg.org/multipage/#dom-dialog-close
|
|
fn Close(&self, return_value: Option<DOMString>) {
|
|
let element = self.upcast::<Element>();
|
|
let target = self.upcast::<EventTarget>();
|
|
let win = window_from_node(self);
|
|
|
|
// Step 1 & 2
|
|
if element
|
|
.remove_attribute(&ns!(), &local_name!("open"))
|
|
.is_none()
|
|
{
|
|
return;
|
|
}
|
|
|
|
// Step 3
|
|
if let Some(new_value) = return_value {
|
|
*self.return_value.borrow_mut() = new_value;
|
|
}
|
|
|
|
// TODO: Step 4 implement pending dialog stack removal
|
|
|
|
// Step 5
|
|
win.task_manager()
|
|
.dom_manipulation_task_source()
|
|
.queue_simple_event(target, atom!("close"), &win);
|
|
}
|
|
}
|