diff --git a/moli-renderer-v8/src/native_bridge/context_host/image_loads.rs b/moli-renderer-v8/src/native_bridge/context_host/image_loads.rs index e9b5e1a289e..49e22aba16e 100644 --- a/moli-renderer-v8/src/native_bridge/context_host/image_loads.rs +++ b/moli-renderer-v8/src/native_bridge/context_host/image_loads.rs @@ -204,7 +204,7 @@ impl JsContextHost { return None; } pending.network_state = - PendingImageLoadNetworkState::Ready(PendingImageLoadTerminalSource::Local); + PendingImageLoadNetworkState::Ready(PendingImageLoadTerminalSource::Reused); tracing::debug!( image = image_handle.index(), sequence = id.get(), diff --git a/moli-renderer-v8/src/native_bridge/context_host/mod.rs b/moli-renderer-v8/src/native_bridge/context_host/mod.rs index 6848bc9979c..4719e7f9976 100644 --- a/moli-renderer-v8/src/native_bridge/context_host/mod.rs +++ b/moli-renderer-v8/src/native_bridge/context_host/mod.rs @@ -736,6 +736,8 @@ pub(crate) enum PendingImageLoadNetworkState { pub(crate) enum PendingImageLoadTerminalSource { Local, Network, + /// Decoded pixels accepted by this Document; no new fetch took place. + Reused, } impl PendingImageLoadEvent { diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/images.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/images.rs index 8323d5fbfcd..9e544c37255 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/images.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/images.rs @@ -1473,3 +1473,80 @@ async fn image_decode_cross_realm_loads_settle_in_the_receiver_realm() { } } } + +#[tokio::test] +async fn available_image_reuse_does_not_start_another_fetch_or_timing_entry() { + for policy in [ + moli_page_types::LayoutPolicy::Mock, + moli_page_types::LayoutPolicy::OnDemand, + ] { + let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap(); + loader.set_image_fetch_enabled(true); + let mut vm = new_storage_page_task_executor_test_vm_with_loader( + "https://image-reuse-timing.test/page.html", + &loader, + ); + vm.set_layout_policy(policy); + vm.set_fetch_subresource_interception( + true, + Some(crate::types::SubresourceResourceType::Image), + ); + vm.eval( + r#" + globalThis.__reuseLoads = []; + globalThis.__reuseTimeline = 'pending'; + (async () => { + for (const path of ['/shared.gif', '/shared.gif', '/canary.gif']) { + await new Promise(resolve => { + const image = document.createElement('img'); + image.onload = () => { __reuseLoads.push(path); resolve(); }; + image.onerror = () => { __reuseLoads.push('error'); resolve(); }; + image.src = path; + document.body.appendChild(image); + }); + } + __reuseTimeline = performance.getEntriesByType('resource') + .map(entry => new URL(entry.name).pathname).join('|'); + })(); + "#, + ) + .unwrap(); + let first = vm.take_pending_subresource_fetch_infos(); + assert_eq!(first.len(), 1, "{policy:?}: initial fetch"); + vm.fulfill_pending_subresource_fetch( + first[0].internal_id, + 200, + vec![("Content-Type".into(), b"image/gif".to_vec())], + one_by_one_gif_response_body(), + ) + .unwrap(); + run_next_image_event_task(&mut vm, &loader, "first shared image load").await; + assert_eq!(vm.eval("__reuseLoads.join('|')").unwrap(), "/shared.gif"); + assert!( + vm.take_pending_subresource_fetch_infos().is_empty(), + "{policy:?}: an available image must not start another fetch" + ); + run_next_image_event_task(&mut vm, &loader, "reused shared image load").await; + let canary = vm.take_pending_subresource_fetch_infos(); + assert_eq!(canary.len(), 1, "{policy:?}: distinct URL must fetch"); + assert_eq!(canary[0].url.path(), "/canary.gif"); + vm.fulfill_pending_subresource_fetch( + canary[0].internal_id, + 200, + vec![("Content-Type".into(), b"image/gif".to_vec())], + one_by_one_gif_response_body(), + ) + .unwrap(); + run_next_image_event_task(&mut vm, &loader, "canary image load").await; + assert_eq!( + vm.eval("__reuseLoads.join('|')").unwrap(), + "/shared.gif|/shared.gif|/canary.gif", + "{policy:?}" + ); + assert_eq!( + vm.eval("__reuseTimeline").unwrap(), + "/shared.gif|/canary.gif", + "{policy:?}" + ); + } +}