mirror of
https://github.com/servo/servo.git
synced 2025-06-10 17:43:16 +00:00
5a5d796988
This fixes common crash related to slottables, currently present on wpt.fyi. Previously, the traversal parent of `Text` nodes was incorrectly assumed to always be the parent or shadow host. That caused crashes inside stylo's bloom filter. Now the traversal parent is the slot that the node is assigned to, if any, and the parent/shadow host otherwise. The slottable data for Text/Element nodes is now stored in NodeRareData. This is very cheap, because NodeRareData will already be instantiated for assigned slottables anyways, because the containing_shadow_root field will be set (since assigned slottables are always in a shadow tree). This change is necessary because we need to hand out references to the assigned slot to stylo and that is not possible to do (without unsafe code) if we need to downcast the node first. As a side effect, this reduces the size of `Text` from 256 to 232 bytes, because the slottable data is no longer stored there. Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
61 lines
2.6 KiB
Rust
61 lines
2.6 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/. */
|
|
|
|
use std::rc::Rc;
|
|
|
|
use euclid::default::Rect;
|
|
use servo_atoms::Atom;
|
|
|
|
use crate::dom::bindings::root::Dom;
|
|
use crate::dom::customelementregistry::{
|
|
CustomElementDefinition, CustomElementReaction, CustomElementState,
|
|
};
|
|
use crate::dom::elementinternals::ElementInternals;
|
|
use crate::dom::htmlslotelement::SlottableData;
|
|
use crate::dom::mutationobserver::RegisteredObserver;
|
|
use crate::dom::node::UniqueId;
|
|
use crate::dom::shadowroot::ShadowRoot;
|
|
use crate::dom::window::LayoutValue;
|
|
|
|
//XXX(ferjm) Ideally merge NodeRareData and ElementRareData so they share
|
|
// storage.
|
|
|
|
#[derive(Default, JSTraceable, MallocSizeOf)]
|
|
#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
|
|
pub(crate) struct NodeRareData {
|
|
/// The shadow root the node belongs to.
|
|
/// This is None if the node is not in a shadow tree or
|
|
/// if it is a ShadowRoot.
|
|
pub(crate) containing_shadow_root: Option<Dom<ShadowRoot>>,
|
|
/// Registered observers for this node.
|
|
pub(crate) mutation_observers: Vec<RegisteredObserver>,
|
|
/// Lazily-generated Unique Id for this node.
|
|
pub(crate) unique_id: Option<UniqueId>,
|
|
|
|
pub(crate) slottable_data: SlottableData,
|
|
}
|
|
|
|
#[derive(Default, JSTraceable, MallocSizeOf)]
|
|
#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
|
|
pub(crate) struct ElementRareData {
|
|
/// <https://dom.spec.whatwg.org/#dom-element-shadowroot>
|
|
/// The ShadowRoot this element is host of.
|
|
pub(crate) shadow_root: Option<Dom<ShadowRoot>>,
|
|
/// <https://html.spec.whatwg.org/multipage/#custom-element-reaction-queue>
|
|
pub(crate) custom_element_reaction_queue: Vec<CustomElementReaction>,
|
|
/// <https://dom.spec.whatwg.org/#concept-element-custom-element-definition>
|
|
#[ignore_malloc_size_of = "Rc"]
|
|
pub(crate) custom_element_definition: Option<Rc<CustomElementDefinition>>,
|
|
/// <https://dom.spec.whatwg.org/#concept-element-custom-element-state>
|
|
pub(crate) custom_element_state: CustomElementState,
|
|
/// The "name" content attribute; not used as frequently as id, but used
|
|
/// in named getter loops so it's worth looking up quickly when present
|
|
#[no_trace]
|
|
pub(crate) name_attribute: Option<Atom>,
|
|
/// The client rect reported by layout.
|
|
#[no_trace]
|
|
pub(crate) client_rect: Option<LayoutValue<Rect<i32>>>,
|
|
/// <https://html.spec.whatwg.org/multipage#elementinternals>
|
|
pub(crate) element_internals: Option<Dom<ElementInternals>>,
|
|
}
|