mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
5e9de2cb61
`EmbedderMsg` was previously paired with an implicit `Option<WebViewId>`, even though almost all variants were either always `Some` or always `None`, depending on whether there was a `WebView involved. This patch adds the `WebViewId` to as many `EmbedderMsg` variants as possible, so we can call their associated `WebView` delegate methods without needing to check and unwrap the `Option`. In many cases, this required more changes to plumb through the `WebViewId`. Notably, all `Request`s now explicitly need a `WebView` or not, in order to ensure that it is passed when appropriate. Signed-off-by: Delan Azabani <dazabani@igalia.com> Co-authored-by: Martin Robinson <mrobinson@igalia.com>
120 lines
3.8 KiB
Rust
120 lines
3.8 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/. */
|
|
|
|
//! Infrastructure to initiate network requests for images needed by layout. The script thread needs
|
|
//! to be responsible for them because there's no guarantee that the responsible nodes will still
|
|
//! exist in the future if layout holds on to them during asynchronous operations.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use net_traits::image_cache::{ImageCache, PendingImageId};
|
|
use net_traits::request::{Destination, RequestBuilder as FetchRequestInit, RequestId};
|
|
use net_traits::{
|
|
FetchMetadata, FetchResponseListener, FetchResponseMsg, NetworkError, ResourceFetchTiming,
|
|
ResourceTimingType,
|
|
};
|
|
use servo_url::ServoUrl;
|
|
|
|
use crate::dom::bindings::refcounted::Trusted;
|
|
use crate::dom::bindings::reflector::DomObject;
|
|
use crate::dom::bindings::root::DomRoot;
|
|
use crate::dom::document::Document;
|
|
use crate::dom::globalscope::GlobalScope;
|
|
use crate::dom::node::{Node, NodeTraits};
|
|
use crate::dom::performanceresourcetiming::InitiatorType;
|
|
use crate::network_listener::{self, PreInvoke, ResourceTimingListener};
|
|
use crate::script_runtime::CanGc;
|
|
|
|
struct LayoutImageContext {
|
|
id: PendingImageId,
|
|
cache: Arc<dyn ImageCache>,
|
|
resource_timing: ResourceFetchTiming,
|
|
doc: Trusted<Document>,
|
|
url: ServoUrl,
|
|
}
|
|
|
|
impl FetchResponseListener for LayoutImageContext {
|
|
fn process_request_body(&mut self, _: RequestId) {}
|
|
fn process_request_eof(&mut self, _: RequestId) {}
|
|
fn process_response(
|
|
&mut self,
|
|
request_id: RequestId,
|
|
metadata: Result<FetchMetadata, NetworkError>,
|
|
) {
|
|
self.cache.notify_pending_response(
|
|
self.id,
|
|
FetchResponseMsg::ProcessResponse(request_id, metadata),
|
|
);
|
|
}
|
|
|
|
fn process_response_chunk(&mut self, request_id: RequestId, payload: Vec<u8>) {
|
|
self.cache.notify_pending_response(
|
|
self.id,
|
|
FetchResponseMsg::ProcessResponseChunk(request_id, payload),
|
|
);
|
|
}
|
|
|
|
fn process_response_eof(
|
|
&mut self,
|
|
request_id: RequestId,
|
|
response: Result<ResourceFetchTiming, NetworkError>,
|
|
) {
|
|
self.cache.notify_pending_response(
|
|
self.id,
|
|
FetchResponseMsg::ProcessResponseEOF(request_id, response),
|
|
);
|
|
}
|
|
|
|
fn resource_timing_mut(&mut self) -> &mut ResourceFetchTiming {
|
|
&mut self.resource_timing
|
|
}
|
|
|
|
fn resource_timing(&self) -> &ResourceFetchTiming {
|
|
&self.resource_timing
|
|
}
|
|
|
|
fn submit_resource_timing(&mut self) {
|
|
network_listener::submit_timing(self, CanGc::note())
|
|
}
|
|
}
|
|
|
|
impl ResourceTimingListener for LayoutImageContext {
|
|
fn resource_timing_information(&self) -> (InitiatorType, ServoUrl) {
|
|
(InitiatorType::Other, self.url.clone())
|
|
}
|
|
|
|
fn resource_timing_global(&self) -> DomRoot<GlobalScope> {
|
|
self.doc.root().global()
|
|
}
|
|
}
|
|
|
|
impl PreInvoke for LayoutImageContext {}
|
|
|
|
pub(crate) fn fetch_image_for_layout(
|
|
url: ServoUrl,
|
|
node: &Node,
|
|
id: PendingImageId,
|
|
cache: Arc<dyn ImageCache>,
|
|
) {
|
|
let document = node.owner_document();
|
|
let context = LayoutImageContext {
|
|
id,
|
|
cache,
|
|
resource_timing: ResourceFetchTiming::new(ResourceTimingType::Resource),
|
|
doc: Trusted::new(&document),
|
|
url: url.clone(),
|
|
};
|
|
|
|
let request = FetchRequestInit::new(
|
|
Some(document.webview_id()),
|
|
url,
|
|
document.global().get_referrer(),
|
|
)
|
|
.origin(document.origin().immutable().clone())
|
|
.destination(Destination::Image)
|
|
.pipeline_id(Some(document.global().pipeline_id()));
|
|
|
|
// Layout image loads do not delay the document load event.
|
|
document.fetch_background(request, context);
|
|
}
|