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

dom: Optimize IFrameCollection::validate (#38196)

Browse source 
The `IFrameCollection` was previously rebuilt too often. This PR tries
to address the todo, to only rebuild the IFrameCollection when
necessary.

Testing: `CSS Selector Invalidation: :has() invalidation should not be
O(n^2)` wpt-test changed status from timeout to failed.
Fixes: #38131 (IFrameCollection::validate accounts for 30% of script
time in DOM heavy scenarios)


Co-authored-by: sharpshooter_pt <ibluegalaxy_taoj@163.com>

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2025-07-22 11:54:16 +08:00 • committed by GitHub
parent 03ab419793
commit 97f544aa20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 46 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
components/script/iframe_collection.rs
View file

@ -2,7 +2,6 @@
* 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::cell::Cell;
use std::default::Default;
use base::id::BrowsingContextId;
@ -29,25 +28,31 @@ pub(crate) struct IFrame {
#[derive(Default, JSTraceable, MallocSizeOf)]
#[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)]
pub(crate) struct IFrameCollection {
/// The version of the [`Document`] that this collection refers to. When the versions
/// do not match, the collection will need to be rebuilt.
document_version: Cell<u64>,
/// The `<iframe>`s in the collection.
iframes: Vec<IFrame>,
/// When true, the collection will need to be rebuilt.
invalid: bool,
}
impl IFrameCollection {
pub(crate) fn new() -> Self {
Self {
iframes: vec![],
invalid: true,
}
}
pub(crate) fn invalidate(&mut self) {
self.invalid = true;
}
/// Validate that the collection is up-to-date with the given [`Document`]. If it isn't up-to-date
/// rebuild it.
pub(crate) fn validate(&mut self, document: &Document) {
// TODO: Whether the DOM has changed at all can lead to rebuilding this collection
// when it isn't necessary. A better signal might be if any `<iframe>` nodes have
// been connected or disconnected.
let document_node = DomRoot::from_ref(document.upcast::<Node>());
let document_version = document_node.inclusive_descendants_version();
if document_version == self.document_version.get() {
if !self.invalid {
return;
}
let document_node = DomRoot::from_ref(document.upcast::<Node>());
// Preserve any old sizes, but only for `<iframe>`s that already have a
// BrowsingContextId and a set size.
@ -75,7 +80,7 @@ impl IFrameCollection {
}
})
.collect();
self.document_version.set(document_version);
self.invalid = false;
}
pub(crate) fn get(&self, browsing_context_id: BrowsingContextId) -> Option<&IFrame> {