Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(runtime): share document settings snapshots
ldm0ff70590d7fb5
diff --git a/moli-core/src/runtime/mod.rs b/moli-core/src/runtime/mod.rsindex 47d587511..1ff311360 100644--- a/moli-core/src/runtime/mod.rs+++ b/moli-core/src/runtime/mod.rs@@ -1170,7 +1170,9 @@ impl Browser {None,stage,);- create_page_request.script_execution_disabled = self.config.script_execution_disabled();+ create_page_request+ .document_settings+ .script_execution_disabled = self.config.script_execution_disabled();create_page_request.wpt_extensions_enabled = self.config.wpt_extensions_enabled();create_page_request.reply_boundary = reply_boundary;create_page_request.lifecycle_decider = lifecycle_decider;@@ -1309,7 +1311,10 @@ impl Browser {indexed_db_manager: Some(self.partition.weak_indexed_db_manager()),storage_bucket_store: Some(self.partition.storage_bucket_store()),document_start_scripts,- script_execution_disabled: self.config.script_execution_disabled(),+ document_settings: moli_page_types::DocumentSettings {+ script_execution_disabled: self.config.script_execution_disabled(),+ ..Default::default()+ },..Default::default()},)diff --git a/moli-core/src/runtime/navigation_engine.rs b/moli-core/src/runtime/navigation_engine.rsindex 0db735f91..00b62da6a 100644--- a/moli-core/src/runtime/navigation_engine.rs+++ b/moli-core/src/runtime/navigation_engine.rs@@ -199,14 +199,7 @@ pub struct PreparedDocumentPageCommitConfiguration {pub runtime_isolated_worlds: Vec<RuntimeIsolatedWorldDefinition>,pub permission_overrides: Vec<PermissionOverrideRegistration>,pub extra_http_headers: moli_fetch::RequestHeaders,- pub script_execution_disabled: bool,- pub emulated_scrollbars_hidden: bool,- pub bypass_content_security_policy: bool,- pub emulated_media: EmulatedMediaOverrides,- pub idle_override: Option<crate::page::EmulatedIdleOverride>,- pub navigator_overrides: moli_page_types::NavigatorOverrides,- pub viewport_surface: Option<ViewportSurface>,- pub document_activity: moli_page_types::DocumentActivity,+ pub document_settings: moli_page_types::DocumentSettings,pub browser_resource_runtime: BrowserResourceRuntime,pub navigator_identity: moli_browser_profile::BrowserIdentityProfile,pub network_offline: bool,@@ -261,14 +254,7 @@ impl PreparedDocumentPage {runtime_isolated_worlds: configuration.runtime_isolated_worlds,permission_overrides: configuration.permission_overrides,extra_http_headers: configuration.extra_http_headers,- script_execution_disabled: configuration.script_execution_disabled,- emulated_scrollbars_hidden: configuration.emulated_scrollbars_hidden,- bypass_content_security_policy: configuration.bypass_content_security_policy,- emulated_media: configuration.emulated_media,- idle_override: configuration.idle_override,- navigator_overrides: configuration.navigator_overrides,- viewport_surface: configuration.viewport_surface,- document_activity: configuration.document_activity,+ document_settings: configuration.document_settings,browser_resource_runtime: configuration.browser_resource_runtime,navigator_identity: configuration.navigator_identity,network_offline: configuration.network_offline,@@ -1569,12 +1555,15 @@ impl NavigationEngine {document_start_scripts,runtime_bindings,extra_http_headers,- script_execution_disabled,- emulated_scrollbars_hidden: self.emulated_scrollbars_hidden,- bypass_content_security_policy,- emulated_media,- viewport_surface,- document_activity: self.document_activity,+ document_settings: moli_page_types::DocumentSettings {+ script_execution_disabled,+ scrollbars_hidden: self.emulated_scrollbars_hidden,+ bypass_content_security_policy,+ emulated_media,+ viewport_surface,+ document_activity: self.document_activity,+ ..Default::default()+ },network_offline,blocked_url_patterns,fetch_subresource_interception_enabled,@@ -1850,12 +1839,15 @@ impl NavigationEngine {document_start_scripts,runtime_bindings,extra_http_headers,- script_execution_disabled,- emulated_scrollbars_hidden: self.emulated_scrollbars_hidden,- bypass_content_security_policy,- emulated_media,- viewport_surface,- document_activity: self.document_activity,+ document_settings: moli_page_types::DocumentSettings {+ script_execution_disabled,+ scrollbars_hidden: self.emulated_scrollbars_hidden,+ bypass_content_security_policy,+ emulated_media,+ viewport_surface,+ document_activity: self.document_activity,+ ..Default::default()+ },network_offline,blocked_url_patterns,fetch_subresource_interception_enabled,@@ -2104,12 +2096,15 @@ impl NavigationEngine {document_start_scripts: options.document_start_scripts,runtime_bindings: options.runtime_bindings,extra_http_headers: options.extra_http_headers,- script_execution_disabled: options.script_execution_disabled,- emulated_scrollbars_hidden: self.emulated_scrollbars_hidden,- bypass_content_security_policy: options.bypass_content_security_policy,- emulated_media: options.emulated_media,- viewport_surface: options.viewport_surface,- document_activity: self.document_activity,+ document_settings: moli_page_types::DocumentSettings {+ script_execution_disabled: options.script_execution_disabled,+ scrollbars_hidden: self.emulated_scrollbars_hidden,+ bypass_content_security_policy: options.bypass_content_security_policy,+ emulated_media: options.emulated_media,+ viewport_surface: options.viewport_surface,+ document_activity: self.document_activity,+ ..Default::default()+ },network_offline: options.network_offline,blocked_url_patterns: options.blocked_url_patterns,fetch_subresource_interception_enabled: optionsdiff --git a/moli-page-types/src/document_settings.rs b/moli-page-types/src/document_settings.rsnew file mode 100644index 000000000..1eb88ffd2--- /dev/null+++ b/moli-page-types/src/document_settings.rs@@ -0,0 +1,22 @@+use crate::{+ DocumentActivity, EmulatedIdleOverride, EmulatedMediaOverrides, NavigatorOverrides,+ ViewportSurface,+};++/// Target settings installed before a Document starts executing scripts.+///+/// HTML creation, streaming creation and prepared-document commit carry the+/// same snapshot. Live Page commands update these values independently of+/// immutable browser startup configuration and document response metadata.+#[derive(Clone, Debug, Default, PartialEq)]+pub struct DocumentSettings {+ pub script_execution_disabled: bool,+ /// Target emulation contribution; startup scrollbar hiding remains separate.+ pub scrollbars_hidden: bool,+ pub bypass_content_security_policy: bool,+ pub emulated_media: EmulatedMediaOverrides,+ pub idle_override: Option<EmulatedIdleOverride>,+ pub navigator_overrides: NavigatorOverrides,+ pub viewport_surface: Option<ViewportSurface>,+ pub document_activity: DocumentActivity,+}diff --git a/moli-page-types/src/layout.rs b/moli-page-types/src/layout.rsindex c8047eede..200197b99 100644--- a/moli-page-types/src/layout.rs+++ b/moli-page-types/src/layout.rs@@ -18,6 +18,19 @@ impl LayoutPolicy {}}+/// Immutable browser layout configuration, sealed before its first Page.+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]+pub struct LayoutConfiguration {+ pub policy: LayoutPolicy,+ pub scrollbars_hidden: bool,+}++impl LayoutConfiguration {+ pub const fn scrollbars_hidden_for(self, emulated_hidden: bool) -> bool {+ self.scrollbars_hidden || emulated_hidden+ }+}+#[cfg(test)]mod tests {use super::*;diff --git a/moli-page-types/src/lib.rs b/moli-page-types/src/lib.rsindex 1b0451822..b65fcd50d 100644--- a/moli-page-types/src/lib.rs+++ b/moli-page-types/src/lib.rs@@ -5,6 +5,7 @@//! snapshots that are shared by the facade, renderer, and CDP crates.mod document_activity;+mod document_settings;mod inspector_identity;mod inspector_state;mod layout;@@ -41,12 +42,13 @@ use moli_web_mime::{extract_response_mime_essence, is_json_mime};const SUBRESOURCE_RESPONSE_BODY_MEMORY_LIMIT: usize = 1024 * 1024;pub use document_activity::DocumentActivity;+pub use document_settings::DocumentSettings;pub use inspector_identity::{DevToolsSessionKey, FrontendCommandId, RendererAgentAttachmentId, RendererCallId,RendererCallIdOutOfRange, RendererDevToolsAgentToken, RendererDevToolsCommandId,RendererInspectorResponseDelivery,};-pub use layout::LayoutPolicy;+pub use layout::{LayoutConfiguration, LayoutPolicy};pub use navigator_overrides::{GeolocationPositionOverride, NavigatorEmulationSessions, NavigatorOverrides,NavigatorQueryOverrides,diff --git a/moli-protocol/src/conn/runtime_load.rs b/moli-protocol/src/conn/runtime_load.rsindex 1f83974d0..3bd7f7216 100644--- a/moli-protocol/src/conn/runtime_load.rs+++ b/moli-protocol/src/conn/runtime_load.rs@@ -1489,14 +1489,16 @@ impl CdpConnection {runtime_isolated_worlds: Vec::new(),permission_overrides: load_inputs.permission_overrides,extra_http_headers: load_inputs.extra_http_headers,- script_execution_disabled: load_inputs.script_execution_disabled,- emulated_scrollbars_hidden: load_inputs.scrollbars_hidden,- bypass_content_security_policy: load_inputs.bypass_content_security_policy,- emulated_media: load_inputs.emulated_media,- idle_override,- navigator_overrides: load_inputs.navigator_overrides,- viewport_surface: load_inputs.viewport_surface,- document_activity: load_inputs.document_activity,+ document_settings: moli_page_types::DocumentSettings {+ script_execution_disabled: load_inputs.script_execution_disabled,+ scrollbars_hidden: load_inputs.scrollbars_hidden,+ bypass_content_security_policy: load_inputs.bypass_content_security_policy,+ emulated_media: load_inputs.emulated_media,+ idle_override,+ navigator_overrides: load_inputs.navigator_overrides,+ viewport_surface: load_inputs.viewport_surface,+ document_activity: load_inputs.document_activity,+ },browser_resource_runtime,navigator_identity,network_offline: load_inputs.network_offline,diff --git a/moli-protocol/src/domains/emulation/tests.rs b/moli-protocol/src/domains/emulation/tests.rsindex 69ebbe7ff..0a3df1ea9 100644--- a/moli-protocol/src/domains/emulation/tests.rs+++ b/moli-protocol/src/domains/emulation/tests.rs@@ -825,7 +825,7 @@ async fn idle_override_updates_idle_detector_and_clear_restores_actual_state() {).expect("commit configuration should resolve the target resource runtime");assert_eq!(- configuration.idle_override,+ configuration.document_settings.idle_override,Some(moli_core::page::EmulatedIdleOverride {is_user_active: false,is_screen_unlocked: false,@@ -839,7 +839,7 @@ async fn idle_override_updates_idle_detector_and_clear_restores_actual_state() {).expect("cross-site commit configuration should resolve the target resource runtime");assert_eq!(- cross_site_configuration.idle_override, None,+ cross_site_configuration.document_settings.idle_override, None,"a cross-site renderer replacement must not inherit frame-host idle state",);server.abort();diff --git a/moli-renderer-v8/src/runtime/owner.rs b/moli-renderer-v8/src/runtime/owner.rsindex 06a02c525..994334f2e 100644--- a/moli-renderer-v8/src/runtime/owner.rs+++ b/moli-renderer-v8/src/runtime/owner.rs@@ -112,14 +112,7 @@ pub struct RendererPreparedDocumentCommitConfiguration {pub runtime_isolated_worlds: Vec<crate::protocol_types::RuntimeIsolatedWorldDefinition>,pub permission_overrides: Vec<crate::protocol_types::PermissionOverrideRegistration>,pub extra_http_headers: moli_fetch::RequestHeaders,- pub script_execution_disabled: bool,- pub emulated_scrollbars_hidden: bool,- pub bypass_content_security_policy: bool,- pub emulated_media: crate::protocol_types::EmulatedMediaOverrides,- pub idle_override: Option<crate::protocol_types::EmulatedIdleOverride>,- pub navigator_overrides: moli_page_types::NavigatorOverrides,- pub viewport_surface: Option<crate::protocol_types::ViewportSurface>,- pub document_activity: moli_page_types::DocumentActivity,+ pub document_settings: moli_page_types::DocumentSettings,pub browser_resource_runtime: crate::network::BrowserResourceRuntime,pub navigator_identity: moli_browser_profile::BrowserIdentityProfile,pub network_offline: bool,@@ -158,22 +151,14 @@ pub struct RendererCreateHtmlPageRequest {pub runtime_isolated_worlds: Vec<crate::protocol_types::RuntimeIsolatedWorldDefinition>,pub permission_overrides: Vec<crate::protocol_types::PermissionOverrideRegistration>,pub extra_http_headers: moli_fetch::RequestHeaders,- pub script_execution_disabled: bool,- pub bypass_content_security_policy: bool,+ pub document_settings: moli_page_types::DocumentSettings,pub network_offline: bool,pub blocked_url_patterns: Vec<String>,pub indexed_db_manager: Option<crate::context_bootstrap::WeakIndexedDbManager>,pub storage_bucket_store: Option<crate::context_bootstrap::SharedStorageBucketStore>,- pub emulated_media: crate::protocol_types::EmulatedMediaOverrides,- pub idle_override: Option<crate::protocol_types::EmulatedIdleOverride>,- pub navigator_overrides: moli_page_types::NavigatorOverrides,- pub viewport_surface: Option<crate::protocol_types::ViewportSurface>,- pub document_activity: moli_page_types::DocumentActivity,pub fetch_subresource_interception_enabled: bool,pub fetch_subresource_interception_resource_type: Option<crate::SubresourceResourceType>,- pub layout_policy: LayoutPolicy,- pub scrollbars_hidden: bool,- pub emulated_scrollbars_hidden: bool,+ pub layout_configuration: moli_page_types::LayoutConfiguration,pub wpt_extensions_enabled: bool,pub stage: PageVmInitStage,pub reply_boundary: crate::RendererReplyBoundary,@@ -210,22 +195,14 @@ pub struct RendererCreateStreamingRawPageRequest {pub runtime_isolated_worlds: Vec<crate::protocol_types::RuntimeIsolatedWorldDefinition>,pub permission_overrides: Vec<crate::protocol_types::PermissionOverrideRegistration>,pub extra_http_headers: moli_fetch::RequestHeaders,- pub script_execution_disabled: bool,- pub bypass_content_security_policy: bool,+ pub document_settings: moli_page_types::DocumentSettings,pub network_offline: bool,pub blocked_url_patterns: Vec<String>,pub indexed_db_manager: Option<crate::context_bootstrap::WeakIndexedDbManager>,pub storage_bucket_store: Option<crate::context_bootstrap::SharedStorageBucketStore>,- pub emulated_media: crate::protocol_types::EmulatedMediaOverrides,- pub idle_override: Option<crate::protocol_types::EmulatedIdleOverride>,- pub navigator_overrides: moli_page_types::NavigatorOverrides,- pub viewport_surface: Option<crate::protocol_types::ViewportSurface>,- pub document_activity: moli_page_types::DocumentActivity,pub fetch_subresource_interception_enabled: bool,pub fetch_subresource_interception_resource_type: Option<crate::SubresourceResourceType>,- pub layout_policy: LayoutPolicy,- pub scrollbars_hidden: bool,- pub emulated_scrollbars_hidden: bool,+ pub layout_configuration: moli_page_types::LayoutConfiguration,pub wpt_extensions_enabled: bool,pub stage: PageVmInitStage,pub reply_boundary: crate::RendererReplyBoundary,@@ -1039,7 +1016,7 @@ pub(super) struct RendererOwnerState {#[derive(Debug, Clone, Copy, Default)]struct RendererOwnerLayoutPolicyState {- configuration: Option<(LayoutPolicy, bool)>,+ configuration: Option<moli_page_types::LayoutConfiguration>,}#[cfg(test)]diff --git a/moli-renderer-v8/src/runtime/owner/owner_commands.rs b/moli-renderer-v8/src/runtime/owner/owner_commands.rsindex 60c92a2e5..c758f3679 100644--- a/moli-renderer-v8/src/runtime/owner/owner_commands.rs+++ b/moli-renderer-v8/src/runtime/owner/owner_commands.rs@@ -16,18 +16,22 @@ impl RendererOwnerHandle {!scrollbars_hidden || policy.uses_real_layout(),"hiding scrollbars requires real layout");+ let configuration = moli_page_types::LayoutConfiguration {+ policy,+ scrollbars_hidden,+ };let mut state = self.state.layout_policy.lock();- if let Some((configured_policy, configured_hidden)) = state.configuration {+ if let Some(configured) = state.configuration {ensure!(- (configured_policy, configured_hidden) == (policy, scrollbars_hidden),+ configured == configuration,"renderer owner layout policy is configured as {:?} (scrollbars hidden: {}), cannot change it to {:?} (scrollbars hidden: {})",- configured_policy,- configured_hidden,+ configured.policy,+ configured.scrollbars_hidden,policy,scrollbars_hidden);} else {- state.configuration = Some((policy, scrollbars_hidden));+ state.configuration = Some(configuration);}Ok(())}@@ -38,7 +42,7 @@ impl RendererOwnerHandle {.lock().configuration.unwrap_or_default()- .0+ .policy}pub fn scrollbars_hidden(&self) -> bool {@@ -47,10 +51,12 @@ impl RendererOwnerHandle {.lock().configuration.unwrap_or_default()- .1+ .scrollbars_hidden}- pub(super) fn seal_layout_configuration_for_page_creation(&self) -> (LayoutPolicy, bool) {+ pub(super) fn seal_layout_configuration_for_page_creation(+ &self,+ ) -> moli_page_types::LayoutConfiguration {let mut state = self.state.layout_policy.lock();*state.configuration.get_or_insert_with(Default::default)}diff --git a/moli-renderer-v8/src/runtime/owner/page_creation.rs b/moli-renderer-v8/src/runtime/owner/page_creation.rsindex 25141e026..84bb71671 100644--- a/moli-renderer-v8/src/runtime/owner/page_creation.rs+++ b/moli-renderer-v8/src/runtime/owner/page_creation.rs@@ -657,7 +657,7 @@ impl RendererOwnerHandle {stage: PageVmInitStage,options: crate::RendererDocumentOptions,) -> RendererCreateHtmlPageRequest {- let (layout_policy, scrollbars_hidden) = self.seal_layout_configuration_for_page_creation();+ let layout_configuration = self.seal_layout_configuration_for_page_creation();RendererCreateHtmlPageRequest {page_reservation,root_frame_id: options.root_frame_id,@@ -681,23 +681,15 @@ impl RendererOwnerHandle {runtime_isolated_worlds: Vec::new(),permission_overrides: Vec::new(),extra_http_headers: options.extra_http_headers,- script_execution_disabled: options.script_execution_disabled,- bypass_content_security_policy: options.bypass_content_security_policy,+ document_settings: options.document_settings,network_offline: options.network_offline,blocked_url_patterns: options.blocked_url_patterns,indexed_db_manager: options.indexed_db_manager,storage_bucket_store: options.storage_bucket_store,- emulated_media: options.emulated_media,- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: options.viewport_surface,- document_activity: options.document_activity,fetch_subresource_interception_enabled: options.fetch_subresource_interception_enabled,fetch_subresource_interception_resource_type: options.fetch_subresource_interception_resource_type,- layout_policy,- scrollbars_hidden,- emulated_scrollbars_hidden: options.emulated_scrollbars_hidden,+ layout_configuration,wpt_extensions_enabled: false,stage,reply_boundary: crate::RendererReplyBoundary::Stage,@@ -724,7 +716,7 @@ impl RendererOwnerHandle {stage: PageVmInitStage,options: crate::RendererDocumentOptions,) -> RendererCreateStreamingRawPageRequest {- let (layout_policy, scrollbars_hidden) = self.seal_layout_configuration_for_page_creation();+ let layout_configuration = self.seal_layout_configuration_for_page_creation();RendererCreateStreamingRawPageRequest {document_replacement: None,root_frame_id: options.root_frame_id,@@ -748,13 +740,7 @@ impl RendererOwnerHandle {runtime_isolated_worlds: Vec::new(),permission_overrides: Vec::new(),extra_http_headers: options.extra_http_headers,- script_execution_disabled: options.script_execution_disabled,- bypass_content_security_policy: options.bypass_content_security_policy,- emulated_media: options.emulated_media,- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: options.viewport_surface,- document_activity: options.document_activity,+ document_settings: options.document_settings,network_offline: options.network_offline,blocked_url_patterns: options.blocked_url_patterns,indexed_db_manager: options.indexed_db_manager,@@ -762,9 +748,7 @@ impl RendererOwnerHandle {fetch_subresource_interception_enabled: options.fetch_subresource_interception_enabled,fetch_subresource_interception_resource_type: options.fetch_subresource_interception_resource_type,- layout_policy,- scrollbars_hidden,- emulated_scrollbars_hidden: options.emulated_scrollbars_hidden,+ layout_configuration,wpt_extensions_enabled: false,stage,reply_boundary: crate::RendererReplyBoundary::Stage,@@ -824,22 +808,14 @@ impl RendererOwnerHandle {runtime_isolated_worlds,permission_overrides,extra_http_headers,- script_execution_disabled,- bypass_content_security_policy,+ document_settings,network_offline,blocked_url_patterns,indexed_db_manager,storage_bucket_store,- emulated_media,- idle_override,- navigator_overrides,- viewport_surface,- document_activity,fetch_subresource_interception_enabled,fetch_subresource_interception_resource_type,- layout_policy,- scrollbars_hidden,- emulated_scrollbars_hidden,+ layout_configuration,wpt_extensions_enabled,stage,reply_boundary,@@ -883,7 +859,7 @@ impl RendererOwnerHandle {&response_headers,&final_url,)- .with_content_security_policy_bypass(bypass_content_security_policy);+ .with_content_security_policy_bypass(document_settings.bypass_content_security_policy);let document_default_language =crate::document_language::document_default_language_from_headers(&response_headers);let document_last_modified =@@ -915,22 +891,14 @@ impl RendererOwnerHandle {document_policy_container,document_default_language,document_last_modified,- script_execution_disabled,- bypass_content_security_policy,- emulated_media,- idle_override,- navigator_overrides,- viewport_surface,- document_activity,+ document_settings,network_offline,blocked_url_patterns,indexed_db_manager,storage_bucket_store,fetch_subresource_interception_enabled,fetch_subresource_interception_resource_type,- layout_policy,- scrollbars_hidden,- emulated_scrollbars_hidden,+ layout_configuration,wpt_extensions_enabled,root_frame_id,main_document_commit,@@ -1140,22 +1108,14 @@ impl RendererOwnerHandle {runtime_isolated_worlds,permission_overrides,extra_http_headers,- script_execution_disabled,- bypass_content_security_policy,+ document_settings,network_offline,blocked_url_patterns,indexed_db_manager,storage_bucket_store,- emulated_media,- idle_override,- navigator_overrides,- viewport_surface,- document_activity,fetch_subresource_interception_enabled,fetch_subresource_interception_resource_type,- layout_policy,- scrollbars_hidden,- emulated_scrollbars_hidden,+ layout_configuration,wpt_extensions_enabled,stage,reply_boundary,@@ -1190,7 +1150,7 @@ impl RendererOwnerHandle {&response_headers,&final_url,)- .with_content_security_policy_bypass(bypass_content_security_policy);+ .with_content_security_policy_bypass(document_settings.bypass_content_security_policy);let document_default_language =crate::document_language::document_default_language_from_headers(&response_headers);let document_last_modified =@@ -1219,22 +1179,14 @@ impl RendererOwnerHandle {document_policy_container,document_default_language,document_last_modified,- script_execution_disabled,- bypass_content_security_policy,- emulated_media,- idle_override,- navigator_overrides,- viewport_surface,- document_activity,+ document_settings,network_offline,blocked_url_patterns,indexed_db_manager,storage_bucket_store,fetch_subresource_interception_enabled,fetch_subresource_interception_resource_type,- layout_policy,- scrollbars_hidden,- emulated_scrollbars_hidden,+ layout_configuration,wpt_extensions_enabled,root_frame_id,main_document_commit,@@ -1242,7 +1194,7 @@ impl RendererOwnerHandle {navigation_bootstrap_entry: None,reserved_service_worker_client_id: reserved_service_worker_client.map(RendererReservedServiceWorkerClient::release),- };+};let bootstrap = Box::pin(async move {let started = Instant::now();ConcurrentParseTimeRuntime::create_external_raw_document_response_at_reply_boundary(diff --git a/moli-renderer-v8/src/runtime/owner_local_store/mod.rs b/moli-renderer-v8/src/runtime/owner_local_store/mod.rsindex fa315c9c3..59971159c 100644--- a/moli-renderer-v8/src/runtime/owner_local_store/mod.rs+++ b/moli-renderer-v8/src/runtime/owner_local_store/mod.rs@@ -910,15 +910,7 @@ impl RendererOwnerLocalStore {request.runtime_isolated_worlds = configuration.runtime_isolated_worlds;request.permission_overrides = configuration.permission_overrides;request.extra_http_headers = configuration.extra_http_headers;- request.script_execution_disabled = configuration.script_execution_disabled;- request.emulated_scrollbars_hidden = configuration.emulated_scrollbars_hidden;- request.bypass_content_security_policy =- configuration.bypass_content_security_policy;- request.emulated_media = configuration.emulated_media;- request.idle_override = configuration.idle_override;- request.navigator_overrides = configuration.navigator_overrides;- request.viewport_surface = configuration.viewport_surface;- request.document_activity = configuration.document_activity;+ request.document_settings = configuration.document_settings;request.loader.replace_browser_resource_runtime(configuration.browser_resource_runtime);diff --git a/moli-renderer-v8/src/runtime/page.rs b/moli-renderer-v8/src/runtime/page.rsindex 076204e46..a808982ae 100644--- a/moli-renderer-v8/src/runtime/page.rs+++ b/moli-renderer-v8/src/runtime/page.rs@@ -33,12 +33,7 @@ pub struct RendererDocumentOptions {pub document_start_scripts: Vec<DocumentStartScript>,pub runtime_bindings: Vec<crate::protocol_types::RuntimeBindingRegistration>,pub extra_http_headers: moli_fetch::RequestHeaders,- pub script_execution_disabled: bool,- pub emulated_scrollbars_hidden: bool,- pub bypass_content_security_policy: bool,- pub emulated_media: crate::protocol_types::EmulatedMediaOverrides,- pub viewport_surface: Option<crate::protocol_types::ViewportSurface>,- pub document_activity: moli_page_types::DocumentActivity,+ pub document_settings: moli_page_types::DocumentSettings,pub network_offline: bool,pub blocked_url_patterns: Vec<String>,pub fetch_subresource_interception_enabled: bool,diff --git a/moli-renderer-v8/src/runtime/page_network.rs b/moli-renderer-v8/src/runtime/page_network.rsindex 21e2191c6..dfb7444f7 100644--- a/moli-renderer-v8/src/runtime/page_network.rs+++ b/moli-renderer-v8/src/runtime/page_network.rs@@ -150,13 +150,16 @@ impl PageVm {}pub(crate) fn set_script_execution_disabled(&mut self, disabled: bool) {+ self.document_settings.script_execution_disabled = disabled;self.vm_mut().set_script_execution_disabled(disabled);}pub(crate) fn set_scrollbars_hidden(&mut self, hidden: bool) -> anyhow::Result<()> {- let previous = self.scrollbars_hidden || self.emulated_scrollbars_hidden;- self.emulated_scrollbars_hidden = hidden;- let hidden = self.scrollbars_hidden || hidden;+ let previous = self+ .layout_configuration+ .scrollbars_hidden_for(self.document_settings.scrollbars_hidden);+ self.document_settings.scrollbars_hidden = hidden;+ let hidden = self.layout_configuration.scrollbars_hidden_for(hidden);if previous == hidden {return Ok(());}@@ -167,7 +170,7 @@ impl PageVm {}pub(crate) fn set_bypass_content_security_policy(&mut self, bypass: bool) {- self.bypass_content_security_policy = bypass;+ self.document_settings.bypass_content_security_policy = bypass;self.vm_mut().set_bypass_content_security_policy(bypass);}@@ -175,7 +178,7 @@ impl PageVm {&mut self,overrides: &crate::protocol_types::EmulatedMediaOverrides,) {- self.emulated_media = overrides.clone();+ self.document_settings.emulated_media = overrides.clone();self.vm_mut().set_emulated_media(overrides);}@@ -185,7 +188,7 @@ impl PageVm {) -> anyhow::Result<()> {self.vm_mut().set_idle_override_and_sync_surface(idle_override)?;- self.idle_override = idle_override;+ self.document_settings.idle_override = idle_override;Ok(())}@@ -194,7 +197,7 @@ impl PageVm {viewport_surface: Option<crate::protocol_types::ViewportSurface>,) -> anyhow::Result<()> {self.vm_mut().set_viewport_surface(viewport_surface)?;- self.viewport_surface = viewport_surface;+ self.document_settings.viewport_surface = viewport_surface;Ok(())}@@ -204,7 +207,7 @@ impl PageVm {) -> anyhow::Result<()> {self.vm_mut().set_navigator_overrides_and_sync_surface(overrides)?;- self.navigator_overrides = overrides.clone();+ self.document_settings.navigator_overrides = overrides.clone();Ok(())}@@ -213,7 +216,7 @@ impl PageVm {activity: moli_page_types::DocumentActivity,) -> anyhow::Result<()> {self.vm_mut().set_document_activity(activity)?;- self.document_activity = activity;+ self.document_settings.document_activity = activity;Ok(())}diff --git a/moli-renderer-v8/src/runtime/page_screenshot.rs b/moli-renderer-v8/src/runtime/page_screenshot.rsindex c483ca911..38ce36c75 100644--- a/moli-renderer-v8/src/runtime/page_screenshot.rs+++ b/moli-renderer-v8/src/runtime/page_screenshot.rs@@ -199,12 +199,12 @@ impl PageVm {RendererScreenshotPurpose::Print { .. } => moli_action_window::ActionBarrier::Explicit,};self.flush_page_action_window(barrier)?;- let paint_capture =- request.paint_capture_request(self.viewport_surface.unwrap_or_default())?;+ let paint_capture = request+ .paint_capture_request(self.document_settings.viewport_surface.unwrap_or_default())?;let restore_media = if matches!(request.purpose, RendererScreenshotPurpose::Print { .. })- && self.emulated_media.media.is_none()+ && self.document_settings.emulated_media.media.is_none(){- let previous = self.emulated_media.clone();+ let previous = self.document_settings.emulated_media.clone();let mut print = previous.clone();print.media = Some("print".to_owned());self.set_emulated_media(&print);@@ -252,10 +252,10 @@ impl PageVm {before_layout: impl FnOnce(),) -> anyhow::Result<RendererCaptureScreencastFrameReply> {self.flush_page_action_window(moli_action_window::ActionBarrier::Screencast)?;- if self.layout_policy == LayoutPolicy::Mock {+ if self.layout_configuration.policy == LayoutPolicy::Mock {return Ok(RendererCaptureScreencastFrameReply::LayoutDisabled);}- let surface = self.viewport_surface.unwrap_or_default();+ let surface = self.document_settings.viewport_surface.unwrap_or_default();let viewport = PaintViewport::new(surface.inner_width,surface.inner_height,@@ -319,10 +319,10 @@ impl PageVm {) -> anyhow::Result<RendererImageCaptureOutcome> {let profile_enabled = moli_trace::cpu_profile_enabled();let total_started = profile_enabled.then(Instant::now);- if self.layout_policy == LayoutPolicy::Mock {+ if self.layout_configuration.policy == LayoutPolicy::Mock {return Ok(RendererImageCaptureOutcome::LayoutDisabled);}- let surface = self.viewport_surface.unwrap_or_default();+ let surface = self.document_settings.viewport_surface.unwrap_or_default();let viewport = PaintViewport::new(surface.inner_width,surface.inner_height,diff --git a/moli-renderer-v8/src/runtime/page_vm/followed_navigation.rs b/moli-renderer-v8/src/runtime/page_vm/followed_navigation.rsindex 68fa48123..eea584692 100644--- a/moli-renderer-v8/src/runtime/page_vm/followed_navigation.rs+++ b/moli-renderer-v8/src/runtime/page_vm/followed_navigation.rs@@ -1192,13 +1192,10 @@ impl PageVm {},document_default_language: None,document_last_modified: None,- script_execution_disabled: self.script_execution_disabled(),- bypass_content_security_policy: self.bypass_content_security_policy,- emulated_media: self.emulated_media.clone(),- idle_override: self.idle_override,- navigator_overrides: self.navigator_overrides.clone(),- viewport_surface: self.viewport_surface,- document_activity: self.document_activity,+ document_settings: moli_page_types::DocumentSettings {+ script_execution_disabled: self.script_execution_disabled(),+ ..self.document_settings.clone()+ },network_offline: self.network_offline,blocked_url_patterns: self.blocked_url_patterns.clone(),indexed_db_manager: self.indexed_db_manager.clone(),@@ -1206,9 +1203,7 @@ impl PageVm {fetch_subresource_interception_enabled: self.fetch_subresource_interception_enabled,fetch_subresource_interception_resource_type: self.fetch_subresource_interception_resource_type,- layout_policy: self.layout_policy,- scrollbars_hidden: self.scrollbars_hidden,- emulated_scrollbars_hidden: self.emulated_scrollbars_hidden,+ layout_configuration: self.layout_configuration,wpt_extensions_enabled: self.wpt_extensions_enabled,root_frame_id: self.vm().root_frame_id().map(str::to_owned),top_level_storage_key: None,diff --git a/moli-renderer-v8/src/runtime/page_vm/mod.rs b/moli-renderer-v8/src/runtime/page_vm/mod.rsindex d8baddd17..ca179b23d 100644--- a/moli-renderer-v8/src/runtime/page_vm/mod.rs+++ b/moli-renderer-v8/src/runtime/page_vm/mod.rs@@ -40,8 +40,8 @@ use crate::types::ScriptErrorConstructorKind;use crate::types::ScriptSkipReason;use moli_page_types::{ContentSecurityPolicyIssueSnapshot, ContentSecurityPolicyViolationType, InspectorIssueSnapshot,- InspectorSourceCodeLocationSnapshot, LayoutPolicy, QuirksModeIssueSnapshot,- ScriptObservableOutput, ScriptObservableOutputItem, V8InspectorSessionAttach,+ InspectorSourceCodeLocationSnapshot, QuirksModeIssueSnapshot, ScriptObservableOutput,+ ScriptObservableOutputItem, V8InspectorSessionAttach,};use std::{collections::{BTreeMap, HashMap},@@ -1081,22 +1081,14 @@ pub(crate) struct PageVmEnvConfig {pub(crate) document_policy_container: crate::document_runtime::DocumentPolicyContainer,pub(crate) document_default_language: Option<String>,pub(crate) document_last_modified: Option<f64>,- pub(crate) script_execution_disabled: bool,- pub(crate) bypass_content_security_policy: bool,- pub(crate) emulated_media: crate::protocol_types::EmulatedMediaOverrides,- pub(crate) idle_override: Option<crate::protocol_types::EmulatedIdleOverride>,- pub(crate) navigator_overrides: moli_page_types::NavigatorOverrides,- pub(crate) viewport_surface: Option<crate::protocol_types::ViewportSurface>,- pub(crate) document_activity: moli_page_types::DocumentActivity,+ pub(crate) document_settings: moli_page_types::DocumentSettings,pub(crate) network_offline: bool,pub(crate) blocked_url_patterns: Vec<String>,pub(crate) indexed_db_manager: Option<crate::context_bootstrap::WeakIndexedDbManager>,pub(crate) storage_bucket_store: Option<crate::context_bootstrap::SharedStorageBucketStore>,pub(crate) fetch_subresource_interception_enabled: bool,pub(crate) fetch_subresource_interception_resource_type: Option<crate::SubresourceResourceType>,- pub(crate) layout_policy: LayoutPolicy,- pub(crate) scrollbars_hidden: bool,- pub(crate) emulated_scrollbars_hidden: bool,+ pub(crate) layout_configuration: moli_page_types::LayoutConfiguration,pub(crate) wpt_extensions_enabled: bool,pub(crate) navigation_bootstrap_entry: Option<crate::native_bridge::NavigationHistoryEntrySeed>,pub(crate) reserved_service_worker_client_id:@@ -1113,7 +1105,9 @@ impl PageVmEnvConfig {crate::document_runtime::DocumentPolicyContainer::from_navigation_response_headers(headers, final_url,)- .with_content_security_policy_bypass(self.bypass_content_security_policy);+ .with_content_security_policy_bypass(+ self.document_settings.bypass_content_security_policy,+ );debug_assert!(self.document_policy_container.navigation_response_frame_ancestors_check(@@ -1605,21 +1599,14 @@ pub(crate) struct PageVm {pub(super) runtime_inspector_protocol_configurations:BTreeMap<DevToolsSessionKey, RendererInspectorProtocolConfiguration>,pub(super) extra_http_headers: moli_fetch::RequestHeaders,- pub(super) bypass_content_security_policy: bool,- pub(super) emulated_media: crate::protocol_types::EmulatedMediaOverrides,- pub(super) idle_override: Option<crate::protocol_types::EmulatedIdleOverride>,- pub(super) navigator_overrides: moli_page_types::NavigatorOverrides,- pub(super) viewport_surface: Option<crate::protocol_types::ViewportSurface>,- pub(super) document_activity: moli_page_types::DocumentActivity,+ pub(super) document_settings: moli_page_types::DocumentSettings,pub(super) network_offline: bool,pub(super) blocked_url_patterns: Vec<String>,pub(super) indexed_db_manager: Option<crate::context_bootstrap::WeakIndexedDbManager>,pub(super) storage_bucket_store: Option<crate::context_bootstrap::SharedStorageBucketStore>,pub(super) fetch_subresource_interception_enabled: bool,pub(super) fetch_subresource_interception_resource_type: Option<crate::SubresourceResourceType>,- pub(super) layout_policy: LayoutPolicy,- pub(super) scrollbars_hidden: bool,- pub(super) emulated_scrollbars_hidden: bool,+ pub(super) layout_configuration: moli_page_types::LayoutConfiguration,pub(super) wpt_extensions_enabled: bool,pub(crate) runtime_hooks: PageVmRuntimeHooks,pub(super) navigation_response: Option<PageVmNavigationResponse>,@@ -3999,7 +3986,7 @@ impl PageVm {document_title,report,navigation_response: self.navigation_response.clone(),- idle_override: self.idle_override,+ idle_override: self.document_settings.idle_override,service_worker_client_id: self.vm().service_worker_client_id().as_u64(),dedicated_worker_running_worker_isolate_count,performance_metric_snapshot,@@ -4280,7 +4267,7 @@ impl PageVm {);let vm_bootstrap = ScriptVmDefaultWorldBootstrap::from_dom_host_with_resource_completion_sender_browser_context_runtime_and_document_isolate(bootstrap_document,- env.bypass_content_security_policy,+ env.document_settings.bypass_content_security_policy,post_domcontentloaded_page_task_sender,script_event_parser_boundary_sender,resource_completion_sender,@@ -4297,8 +4284,11 @@ impl PageVm {)?;let mut vm = vm_bootstrap.finish()?;vm.set_document_navigator_identity(&env.navigator_identity);- vm.set_layout_policy(env.layout_policy);- vm.set_scrollbars_hidden(env.scrollbars_hidden || env.emulated_scrollbars_hidden);+ vm.set_layout_policy(env.layout_configuration.policy);+ vm.set_scrollbars_hidden(+ env.layout_configuration+ .scrollbars_hidden_for(env.document_settings.scrollbars_hidden),+ );vm.install_page_task_capabilities(page_task_capabilities);vm.set_root_document_lifecycle(document_lifecycle.clone());let dom_agent_state = vm.renderer_dom_agent_state();@@ -4348,12 +4338,7 @@ impl PageVm {}).collect(),extra_http_headers: env.extra_http_headers.clone(),- bypass_content_security_policy: env.bypass_content_security_policy,- emulated_media: env.emulated_media.clone(),- idle_override: env.idle_override,- navigator_overrides: env.navigator_overrides.clone(),- viewport_surface: env.viewport_surface,- document_activity: env.document_activity,+ document_settings: env.document_settings.clone(),network_offline: env.network_offline,blocked_url_patterns: env.blocked_url_patterns.clone(),indexed_db_manager: env.indexed_db_manager.clone(),@@ -4361,9 +4346,7 @@ impl PageVm {fetch_subresource_interception_enabled: env.fetch_subresource_interception_enabled,fetch_subresource_interception_resource_type: env.fetch_subresource_interception_resource_type,- layout_policy: env.layout_policy,- scrollbars_hidden: env.scrollbars_hidden,- emulated_scrollbars_hidden: env.emulated_scrollbars_hidden,+ layout_configuration: env.layout_configuration,wpt_extensions_enabled: env.wpt_extensions_enabled,runtime_hooks,navigation_response: None,@@ -4386,7 +4369,7 @@ impl PageVm {page_vm.vm_mut().set_web_storage_handles(&env.web_storage);page_vm.vm_mut()- .set_script_execution_disabled(env.script_execution_disabled);+ .set_script_execution_disabled(env.document_settings.script_execution_disabled);page_vm.vm_mut().set_permission_overrides(&env.permission_overrides);@@ -4412,17 +4395,19 @@ impl PageVm {.set_stored_runtime_bindings(&env.runtime_bindings);page_vm.vm_mut()- .set_emulated_media_for_bootstrap(&env.emulated_media);- page_vm.vm_mut().set_idle_override(env.idle_override);+ .set_emulated_media_for_bootstrap(&env.document_settings.emulated_media);+ page_vm+ .vm_mut()+ .set_idle_override(env.document_settings.idle_override);page_vm.vm_mut()- .set_navigator_overrides(&env.navigator_overrides);+ .set_navigator_overrides(&env.document_settings.navigator_overrides);page_vm.vm_mut()- .set_viewport_surface_for_bootstrap(env.viewport_surface);+ .set_viewport_surface_for_bootstrap(env.document_settings.viewport_surface);page_vm.vm_mut()- .set_document_activity_for_bootstrap(env.document_activity);+ .set_document_activity_for_bootstrap(env.document_settings.document_activity);page_vm.vm_mut().set_network_offline(env.network_offline);page_vm.vm_mut()diff --git a/moli-renderer-v8/src/runtime/page_vm/test_support.rs b/moli-renderer-v8/src/runtime/page_vm/test_support.rsindex dd1d6f62f..6eefc84b3 100644--- a/moli-renderer-v8/src/runtime/page_vm/test_support.rs+++ b/moli-renderer-v8/src/runtime/page_vm/test_support.rs@@ -683,22 +683,17 @@ fn minimal_test_page_vm_env_config() -> PageVmEnvConfig {document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: crate::real_layout_test_policy(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: crate::real_layout_test_policy(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/extracted/page_task_dispatch.rs b/moli-renderer-v8/src/runtime/page_vm/tests/extracted/page_task_dispatch.rsindex f0b7a4014..df44006e3 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/extracted/page_task_dispatch.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/extracted/page_task_dispatch.rs@@ -25,22 +25,17 @@ fn default_runtime_hooks_reject_direct_no_owner_page_vm_construction() {document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: crate::real_layout_test_policy(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: crate::real_layout_test_policy(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rsindex 27f668a13..8125bc3b6 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs@@ -675,22 +675,17 @@ fn test_page_vm_with_loader_dom_host_hooks_and_response_referrer_policy(},document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: crate::real_layout_test_policy(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: crate::real_layout_test_policy(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,diff --git a/moli-renderer-v8/src/runtime/phase_one/mod.rs b/moli-renderer-v8/src/runtime/phase_one/mod.rsindex f499c63cd..2e937c0a7 100644--- a/moli-renderer-v8/src/runtime/phase_one/mod.rs+++ b/moli-renderer-v8/src/runtime/phase_one/mod.rs@@ -109,7 +109,7 @@ fn script_preloads_require_owner_admission(env: &PageVmEnvConfig) -> bool {}fn main_document_parser_scripting_enabled(env: &PageVmEnvConfig) -> bool {- !env.script_execution_disabled+ !env.document_settings.script_execution_disabled&& crate::content_security_policy::content_security_policy_sandbox_allows_scripts(&env.document_policy_container.response_content_security_policies,@@ -666,22 +666,17 @@ mod tests {document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,diff --git a/moli-renderer-v8/src/runtime/phase_one/non_executable_script_tests.rs b/moli-renderer-v8/src/runtime/phase_one/non_executable_script_tests.rsindex 442be09ac..fd80287ed 100644--- a/moli-renderer-v8/src/runtime/phase_one/non_executable_script_tests.rs+++ b/moli-renderer-v8/src/runtime/phase_one/non_executable_script_tests.rs@@ -118,7 +118,7 @@ fn parser_owned_import_map_is_not_registered_when_script_execution_is_disabled()runtime.block_on(tokio::task::LocalSet::new().run_until(async move {let env = super::tests::default_test_page_vm_env_config_with(|env| {- env.script_execution_disabled = true;+ env.document_settings.script_execution_disabled = true;});let mut page_vm = super::tests::parse_phase_one_html_into_page_vm_for_test_with_env(r#"<!doctype html><html><head><script type="importmap">{"imports":{"fixture":"/module.mjs"}}</script></head><body></body></html>"#,diff --git a/moli-renderer-v8/src/runtime/phase_one/streaming.rs b/moli-renderer-v8/src/runtime/phase_one/streaming.rsindex 80a12e649..61a56d096 100644--- a/moli-renderer-v8/src/runtime/phase_one/streaming.rs+++ b/moli-renderer-v8/src/runtime/phase_one/streaming.rs@@ -1069,22 +1069,17 @@ mod tests {document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,diff --git a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_blocking_scripts.rs b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_blocking_scripts.rsindex af0b6b642..6b0ecedc2 100644--- a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_blocking_scripts.rs+++ b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_blocking_scripts.rs@@ -535,7 +535,7 @@ fn parser_blocking_script_disabled_does_not_start_parser_discovered_source_load(let parser_dom_host = state.parser_session.stream_handle().borrow_mut().take_parser_stream_dom_host();let local_executor = JsLocalExecutor::new();let env = default_test_page_vm_env_config_with(|env| {- env.script_execution_disabled = true;+ env.document_settings.script_execution_disabled = true;});let mut page_vm = PageVm::new(PageId::new_for_testing(1),@@ -739,22 +739,17 @@ fn parser_owner_boundary_with_live_backend_queues_document_turn_before_runtime_wdocument_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,@@ -1032,26 +1027,21 @@ fn parser_connected_head_script_does_not_push_later_head_tokens_into_body() {document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),@@ -1213,26 +1203,21 @@ fn parser_connected_external_head_script_with_live_head_and_body_mutation_keeps_document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),@@ -1816,22 +1801,17 @@ fn parser_owner_body_stylesheet_pause_preserves_unconsumed_tail_on_live_page_vm(document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,diff --git a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_flow.rs b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_flow.rsindex 3547dad18..cb3fe7831 100644--- a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_flow.rs+++ b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_flow.rs@@ -17,7 +17,7 @@ fn main_document_parser_derives_scripting_state_from_runtime_and_response_sandbo(false, Some("sandbox allow-scripts"), false),] {let env = default_test_page_vm_env_config_with(|env| {- env.script_execution_disabled = script_execution_disabled;+ env.document_settings.script_execution_disabled = script_execution_disabled;env.document_policy_container.response_content_security_policies =policy.into_iter().map(str::to_owned).collect();diff --git a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_script_handoffs.rs b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_script_handoffs.rsindex 702c22a09..075603fda 100644--- a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_script_handoffs.rs+++ b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/parser_script_handoffs.rs@@ -346,26 +346,21 @@ fn external_async_handoff_marks_parser_stream_already_started_on_live_backend()document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),@@ -474,26 +469,21 @@ fn blocking_classic_handoff_registers_parser_owned_handle_on_live_backend() {document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),@@ -612,26 +602,21 @@ fn non_async_post_parse_handoff_registers_pending_before_source_and_seals_withoudocument_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),@@ -785,26 +770,21 @@ fn parser_owned_external_module_handoff_starts_pending_script_tree_root_fetch()document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),@@ -1104,26 +1084,21 @@ fn parser_owned_inline_importmap_handoff_registers_parser_owned_handle_on_live_bdocument_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),@@ -1273,26 +1248,21 @@ fn parser_owner_style_import_handoff_is_stylesheet_gated_on_live_page_vm() {document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),diff --git a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/preload_scanning_and_csp.rs b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/preload_scanning_and_csp.rsindex 8d158533e..5a49af955 100644--- a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/preload_scanning_and_csp.rs+++ b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/preload_scanning_and_csp.rs@@ -529,7 +529,7 @@ fn script_disabled_preload_scan_defers_every_script_to_the_page_owner() {let final_url = Url::parse("https://example.test/docs/page.html").expect("test url");let loader = ResourceRequestClient::new(&FetchConfig::default()).expect("default loader");let env = default_test_page_vm_env_config_with(|env| {- env.script_execution_disabled = true;+ env.document_settings.script_execution_disabled = true;});let mut cache = BufferedDocumentPreloadState::default();cache.set_script_fetch_requires_owner_admission(script_preloads_require_owner_admission(&env));diff --git a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/tree_mutations_and_document_write.rs b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/tree_mutations_and_document_write.rsindex 41dd54dc3..643594820 100644--- a/moli-renderer-v8/src/runtime/phase_one/tests/extracted/tree_mutations_and_document_write.rs+++ b/moli-renderer-v8/src/runtime/phase_one/tests/extracted/tree_mutations_and_document_write.rs@@ -1140,26 +1140,21 @@ fn parser_connected_head_document_write_keeps_later_head_tokens_in_head() {document_policy_container: Default::default(),document_default_language: None,document_last_modified: None,- script_execution_disabled: false,- bypass_content_security_policy: false,- emulated_media: crate::protocol_types::EmulatedMediaOverrides::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),network_offline: false,blocked_url_patterns: Vec::new(),indexed_db_manager: None,storage_bucket_store: None,fetch_subresource_interception_enabled: false,fetch_subresource_interception_resource_type: None,- layout_policy: moli_page_types::LayoutPolicy::default(),- scrollbars_hidden: false,- emulated_scrollbars_hidden: false,+ layout_configuration: moli_page_types::LayoutConfiguration {+ policy: moli_page_types::LayoutPolicy::default(),+ scrollbars_hidden: false,+ },wpt_extensions_enabled: false,navigation_bootstrap_entry: None,reserved_service_worker_client_id: None,- },+},PageVmRuntimeHooks::standalone_without_owner_reservation_for_test(),parser_dom_host,Instant::now(),diff --git a/moli-renderer-v8/src/runtime/tests/extracted/navigation_streaming.rs b/moli-renderer-v8/src/runtime/tests/extracted/navigation_streaming.rsindex 3bcb656aa..b90ee9783 100644--- a/moli-renderer-v8/src/runtime/tests/extracted/navigation_streaming.rs+++ b/moli-renderer-v8/src/runtime/tests/extracted/navigation_streaming.rs@@ -195,14 +195,7 @@ async fn streaming_unstyled_xml_converts_live_document_before_domcontentloaded()runtime_isolated_worlds: Vec::new(),permission_overrides: Vec::new(),extra_http_headers: Default::default(),- script_execution_disabled: false,- emulated_scrollbars_hidden: false,- bypass_content_security_policy: false,- emulated_media: Default::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),browser_resource_runtime: loader.browser_resource_runtime(),navigator_identity: loader.browser_identity().clone(),network_offline: false,@@ -331,14 +324,7 @@ async fn prepared_streaming_xml_document_waits_for_permit_and_uses_latest_config}],permission_overrides: Vec::new(),extra_http_headers: Default::default(),- script_execution_disabled: false,- emulated_scrollbars_hidden: false,- bypass_content_security_policy: false,- emulated_media: Default::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),browser_resource_runtime: loader.browser_resource_runtime(),navigator_identity: loader.browser_identity().clone(),network_offline: false,@@ -790,14 +776,7 @@ globalThis.__preparedCommitObserved = JSON.stringify([embedded_origin: None,}],extra_http_headers: Default::default(),- script_execution_disabled: false,- emulated_scrollbars_hidden: false,- bypass_content_security_policy: false,- emulated_media: Default::default(),- idle_override: None,- navigator_overrides: Default::default(),- viewport_surface: None,- document_activity: Default::default(),+ document_settings: Default::default(),browser_resource_runtime: loader.browser_resource_runtime(),navigator_identity: loader.browser_identity().clone(),network_offline: false,