From 6adc653083b0366f2b87ca49bf16a908fe32e4d6 Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Thu, 22 Jun 2017 23:48:07 -0700 Subject: Introduce service-worker mode --- components/script/fetch.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'components/script/fetch.rs') diff --git a/components/script/fetch.rs b/components/script/fetch.rs index 39c5cbc8f97..5a5ca041acd 100644 --- a/components/script/fetch.rs +++ b/components/script/fetch.rs @@ -7,6 +7,7 @@ use dom::bindings::codegen::Bindings::RequestBinding::RequestInit; use dom::bindings::codegen::Bindings::ResponseBinding::ResponseBinding::ResponseMethods; use dom::bindings::codegen::Bindings::ResponseBinding::ResponseType as DOMResponseType; use dom::bindings::error::Error; +use dom::bindings::inheritance::Castable; use dom::bindings::js::Root; use dom::bindings::refcounted::{Trusted, TrustedPromise}; use dom::bindings::reflector::DomObject; @@ -16,13 +17,14 @@ use dom::headers::Guard; use dom::promise::Promise; use dom::request::Request; use dom::response::Response; +use dom::serviceworkerglobalscope::ServiceWorkerGlobalScope; use ipc_channel::ipc; use ipc_channel::router::ROUTER; use js::jsapi::JSAutoCompartment; use net_traits::{FetchResponseListener, NetworkError}; use net_traits::{FilteredMetadata, FetchMetadata, Metadata}; use net_traits::CoreResourceMsg::Fetch as NetTraitsFetch; -use net_traits::request::Request as NetTraitsRequest; +use net_traits::request::{Request as NetTraitsRequest, ServiceWorkersMode}; use net_traits::request::RequestInit as NetTraitsRequestInit; use network_listener::{NetworkListener, PreInvoke}; use servo_url::ServoUrl; @@ -83,12 +85,17 @@ pub fn Fetch(global: &GlobalScope, input: RequestInfo, init: RootedTraceableBox< }, Ok(r) => r.get_request(), }; - let request_init = request_init_from_request(request); + let mut request_init = request_init_from_request(request); // Step 3 - response.Headers().set_guard(Guard::Immutable); + if global.downcast::().is_some() { + request_init.service_workers_mode = ServiceWorkersMode::Foreign; + } // Step 4 + response.Headers().set_guard(Guard::Immutable); + + // Step 5 let (action_sender, action_receiver) = ipc::channel().unwrap(); let fetch_context = Arc::new(Mutex::new(FetchContext { fetch_promise: Some(TrustedPromise::new(promise.clone())), -- cgit v1.2.3