Skip to content

script: Store DocumentLoader::blocking_loads in a HashSet instead of a Vec #45974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jschwe merged 3 commits into from
Jul 14, 2026
+25 −14
Merged

script: Store DocumentLoader::blocking_loads in a HashSet instead of a Vec #45974

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7556b2b
document blocker hashset
Narfinger Jun 25, 2026
a0e08f7
incorporate suggestion
Narfinger Jul 9, 2026
835915b
incorporate suggestion
Narfinger Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions components/script/document_loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//!
//! <https://html.spec.whatwg.org/multipage/#the-end>

use std::collections::HashMap;

use net_traits::request::RequestBuilder;
use net_traits::{BoxedFetchCallback, ResourceThreads, fetch_async};
use script_bindings::cell::DomRefCell;
Expand All @@ -16,7 +18,7 @@ use crate::dom::bindings::root::Dom;
use crate::dom::document::Document;
use crate::fetch::FetchCanceller;

#[derive(Clone, Debug, JSTraceable, MallocSizeOf, PartialEq)]
#[derive(Clone, Debug, Eq, Hash, JSTraceable, MallocSizeOf, PartialEq)]
pub(crate) enum LoadType {
Image(#[no_trace] ServoUrl),

@mrobinson mrobinson Jul 9, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if two images are loading with the same URL? I think that could cause an issue here. You will need to store a count instead.

@Narfinger Narfinger Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check if this is how you meant it.

Script(#[no_trace] ServoUrl),
Expand Down Expand Up @@ -93,7 +95,9 @@ impl Drop for LoadBlocker {
pub(crate) struct DocumentLoader {
#[no_trace]
resource_threads: ResourceThreads,
blocking_loads: Vec<LoadType>,
/// A map from [`LoadType`] to the number of blocking loads. When a particular [`LoadType`]
/// reaches zero, it is removed from the map and no longer blocks the load.
blocking_loads: HashMap<LoadType, u32>,
events_inhibited: bool,
cancellers: Vec<FetchCanceller>,
}
Expand All @@ -108,7 +112,11 @@ impl DocumentLoader {
initial_load: Option<ServoUrl>,
) -> DocumentLoader {
debug!("Initial blocking load {:?}.", initial_load);
let initial_loads = initial_load.into_iter().map(LoadType::PageSource).collect();

let initial_loads = initial_load
.into_iter()
.map(|url| (LoadType::PageSource(url), 1))
.collect();

DocumentLoader {
resource_threads,
Expand All @@ -130,7 +138,10 @@ impl DocumentLoader {
load,
self.blocking_loads.len()
);
self.blocking_loads.push(load);
self.blocking_loads
.entry(load)
.and_modify(|load_number| *load_number += 1)
.or_insert(1);
}

/// Initiate a new fetch given a response callback.
Expand Down Expand Up @@ -165,15 +176,15 @@ impl DocumentLoader {
load,
self.blocking_loads.len()
);
let idx = self
.blocking_loads
.iter()
.position(|unfinished| *unfinished == *load);
match idx {
Some(i) => {
self.blocking_loads.remove(i);
},
None => warn!("unknown completed load {:?}", load),

let Some(entry) = self.blocking_loads.get_mut(load) else {
warn!("unknown completed load {load:?}");
return;
};

*entry = entry.saturating_sub(1);
if *entry == 0 {
self.blocking_loads.remove(load);
}
}

Expand All @@ -184,7 +195,7 @@ impl DocumentLoader {

pub(crate) fn is_only_blocked_by_iframes(&self) -> bool {
self.blocking_loads
.iter()
.keys()
.all(|load| matches!(*load, LoadType::Subframe(_)))
}

Expand Down
Loading