mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #17935 - cbrewster:ce_upgrades, r=jdm
Custom element upgrades <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17935) <!-- Reviewable:end -->
This commit is contained in:
commit
a087fee4b4
30 changed files with 318 additions and 295 deletions
|
@ -5377,7 +5377,12 @@ let result = match result {
|
|||
},
|
||||
};
|
||||
|
||||
JS_SetPrototype(cx, result.reflector().get_jsobject(), prototype.handle());
|
||||
rooted!(in(cx) let mut element = result.reflector().get_jsobject().get());
|
||||
if !JS_WrapObject(cx, element.handle_mut()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JS_SetPrototype(cx, element.handle(), prototype.handle());
|
||||
|
||||
(result).to_jsval(cx, args.rval());
|
||||
return true;
|
||||
|
|
|
@ -80,7 +80,8 @@ use dom::bindings::guard::Guard;
|
|||
use dom::bindings::js::Root;
|
||||
use dom::bindings::utils::{DOM_PROTOTYPE_SLOT, ProtoOrIfaceArray, get_proto_or_iface_array};
|
||||
use dom::create::create_native_html_element;
|
||||
use dom::element::{Element, ElementCreator};
|
||||
use dom::customelementregistry::ConstructionStackEntry;
|
||||
use dom::element::{CustomElementState, Element, ElementCreator};
|
||||
use dom::htmlelement::HTMLElement;
|
||||
use dom::window::Window;
|
||||
use html5ever::LocalName;
|
||||
|
@ -281,24 +282,44 @@ pub unsafe fn html_constructor<T>(window: &Window, call_args: &CallArgs) -> Fall
|
|||
}
|
||||
}
|
||||
|
||||
// Step 8.1
|
||||
let name = QualName::new(None, ns!(html), definition.local_name.clone());
|
||||
let element = if definition.is_autonomous() {
|
||||
Root::upcast(HTMLElement::new(name.local, None, &*document))
|
||||
} else {
|
||||
create_native_html_element(name, None, &*document, ElementCreator::ScriptCreated)
|
||||
};
|
||||
let entry = definition.construction_stack.borrow().last().cloned();
|
||||
match entry {
|
||||
// Step 8
|
||||
None => {
|
||||
// Step 8.1
|
||||
let name = QualName::new(None, ns!(html), definition.local_name.clone());
|
||||
let element = if definition.is_autonomous() {
|
||||
Root::upcast(HTMLElement::new(name.local, None, &*document))
|
||||
} else {
|
||||
create_native_html_element(name, None, &*document, ElementCreator::ScriptCreated)
|
||||
};
|
||||
|
||||
// Step 8.2 is performed in the generated caller code.
|
||||
// Step 8.2 is performed in the generated caller code.
|
||||
|
||||
// TODO: Step 8.3 - 8.4
|
||||
// Set the element's custom element state and definition.
|
||||
// Step 8.3
|
||||
element.set_custom_element_state(CustomElementState::Custom);
|
||||
|
||||
// Step 8.5
|
||||
Root::downcast(element).ok_or(Error::InvalidState)
|
||||
// Step 8.4
|
||||
element.set_custom_element_definition(definition.clone());
|
||||
|
||||
// TODO: Steps 9-13
|
||||
// Custom element upgrades are not implemented yet, so these steps are unnecessary.
|
||||
// Step 8.5
|
||||
Root::downcast(element).ok_or(Error::InvalidState)
|
||||
},
|
||||
// Step 9
|
||||
Some(ConstructionStackEntry::Element(element)) => {
|
||||
// Step 11 is performed in the generated caller code.
|
||||
|
||||
// Step 12
|
||||
let mut construction_stack = definition.construction_stack.borrow_mut();
|
||||
construction_stack.pop();
|
||||
construction_stack.push(ConstructionStackEntry::AlreadyConstructedMarker);
|
||||
|
||||
// Step 13
|
||||
Root::downcast(element).ok_or(Error::InvalidState)
|
||||
},
|
||||
// Step 10
|
||||
Some(ConstructionStackEntry::AlreadyConstructedMarker) => Err(Error::InvalidState),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn push_new_element_queue() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue