diff options
Diffstat (limited to 'components/script/dom')
24 files changed, 360 insertions, 525 deletions
diff --git a/components/script/dom/abstractworker.rs b/components/script/dom/abstractworker.rs index f9ff583a0dd..4f2f029800b 100644 --- a/components/script/dom/abstractworker.rs +++ b/components/script/dom/abstractworker.rs @@ -8,10 +8,7 @@ use dom::bindings::str::DOMString; use dom::bindings::structuredclone::StructuredCloneData; use js::jsapi::{JSRuntime, JS_RequestInterruptCallback}; use js::rust::Runtime; -use msg::constellation_msg::{PipelineId, ReferrerPolicy}; -use net_traits::{LoadOrigin, RequestSource}; use script_runtime::CommonScriptMsg; -use url::Url; /// Messages used to control the worker event loops pub enum WorkerScriptMsg { @@ -21,29 +18,6 @@ pub enum WorkerScriptMsg { DOMMessage(StructuredCloneData), } -#[derive(Clone)] -pub struct WorkerScriptLoadOrigin { - pub referrer_url: Option<Url>, - pub referrer_policy: Option<ReferrerPolicy>, - pub request_source: RequestSource, - pub pipeline_id: Option<PipelineId> -} - -impl LoadOrigin for WorkerScriptLoadOrigin { - fn referrer_url(&self) -> Option<Url> { - self.referrer_url.clone() - } - fn referrer_policy(&self) -> Option<ReferrerPolicy> { - self.referrer_policy.clone() - } - fn request_source(&self) -> RequestSource { - self.request_source.clone() - } - fn pipeline_id(&self) -> Option<PipelineId> { - self.pipeline_id.clone() - } -} - pub struct SimpleWorkerErrorHandler<T: Reflectable> { pub addr: Trusted<T>, } diff --git a/components/script/dom/bindings/global.rs b/components/script/dom/bindings/global.rs index 22cb256bd04..5adcbb67818 100644 --- a/components/script/dom/bindings/global.rs +++ b/components/script/dom/bindings/global.rs @@ -20,7 +20,7 @@ use js::jsapi::{JSContext, JSObject, JS_GetClass, MutableHandleValue}; use js::{JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL}; use msg::constellation_msg::{PipelineId, PanicMsg}; use net_traits::filemanager_thread::FileManagerThreadMsg; -use net_traits::{ResourceThreads, CoreResourceThread, RequestSource, IpcSend}; +use net_traits::{ResourceThreads, CoreResourceThread, IpcSend}; use profile_traits::{mem, time}; use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort}; use script_thread::{MainThreadScriptChan, ScriptThread, RunnableWrapper}; @@ -66,14 +66,6 @@ impl<'a> GlobalRef<'a> { } } - /// gets the custom message channel associated with global object - pub fn request_source(&self) -> RequestSource { - match *self { - GlobalRef::Window(ref window) => RequestSource::Window(window.custom_message_chan()), - GlobalRef::Worker(ref worker) => RequestSource::Worker(worker.custom_message_chan()), - } - } - /// Get the `PipelineId` for this global scope. pub fn pipeline(&self) -> PipelineId { match *self { diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs index 310285a8bcd..5d79d29b77b 100644 --- a/components/script/dom/bindings/str.rs +++ b/components/script/dom/bindings/str.rs @@ -113,6 +113,41 @@ pub fn is_token(s: &[u8]) -> bool { } /// A DOMString. +/// +/// This type corresponds to the [`DOMString`](idl) type in WebIDL. +/// +/// [idl]: https://heycam.github.io/webidl/#idl-DOMString +/// +/// Cenceptually, a DOMString has the same value space as a JavaScript String, +/// i.e., an array of 16-bit *code units* representing UTF-16, potentially with +/// unpaired surrogates present (also sometimes called WTF-16). +/// +/// Currently, this type stores a Rust `String`, in order to avoid issues when +/// integrating with the rest of the Rust ecosystem and even the rest of the +/// browser itself. +/// +/// However, Rust `String`s are guaranteed to be valid UTF-8, and as such have +/// a *smaller value space* than WTF-16 (i.e., some JavaScript String values +/// can not be represented as a Rust `String`). This introduces the question of +/// what to do with values being passed from JavaScript to Rust that contain +/// unpaired surrogates. +/// +/// The hypothesis is that it does not matter much how exactly those values are +/// transformed, because passing unpaired surrogates into the DOM is very rare. +/// In order to test this hypothesis, Servo will panic when encountering any +/// unpaired surrogates on conversion to `DOMString` by default. (The command +/// line option `-Z replace-surrogates` instead causes Servo to replace the +/// unpaired surrogate by a U+FFFD replacement character.) +/// +/// Currently, the lack of crash reports about this issue provides some +/// evidence to support the hypothesis. This evidence will hopefully be used to +/// convince other browser vendors that it would be safe to replace unpaired +/// surrogates at the boundary between JavaScript and native code. (This would +/// unify the `DOMString` and `USVString` types, both in the WebIDL standard +/// and in Servo.) +/// +/// This type is currently `!Send`, in order to help with an independent +/// experiment to store `JSString`s rather than Rust `String`s. #[derive(Clone, Debug, Eq, Hash, HeapSizeOf, Ord, PartialEq, PartialOrd)] pub struct DOMString(String); diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index b2bce4f2ece..f63e66e3b7b 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -17,7 +17,6 @@ use ipc_channel::ipc; use net_traits::IpcSend; use net_traits::blob_url_store::{BlobBuf, get_blob_origin}; use net_traits::filemanager_thread::{FileManagerThreadMsg, SelectedFileId, RelativePos}; -use std::ascii::AsciiExt; use std::cell::Cell; use std::ops::Index; use std::path::PathBuf; @@ -86,7 +85,9 @@ impl Blob { Blob { reflector_: Reflector::new(), blob_impl: DOMRefCell::new(blob_impl), - typeString: typeString, + // NOTE: Guarding the format correctness here, + // https://w3c.github.io/FileAPI/#dfn-type + typeString: normalize_type_string(&typeString), isClosed_: Cell::new(false), } } @@ -135,7 +136,7 @@ impl Blob { } }; - Ok(Blob::new(global, BlobImpl::new_from_bytes(bytes), blobPropertyBag.get_typestring())) + Ok(Blob::new(global, BlobImpl::new_from_bytes(bytes), blobPropertyBag.type_.to_string())) } /// Get a slice to inner data, this might incur synchronous read and caching @@ -332,20 +333,8 @@ impl BlobMethods for Blob { end: Option<i64>, contentType: Option<DOMString>) -> Root<Blob> { - let relativeContentType = match contentType { - None => DOMString::new(), - Some(mut str) => { - if is_ascii_printable(&str) { - str.make_ascii_lowercase(); - str - } else { - DOMString::new() - } - } - }; - let rel_pos = RelativePos::from_opts(start, end); - Blob::new_sliced(self, rel_pos, relativeContentType) + Blob::new_sliced(self, rel_pos, contentType.unwrap_or(DOMString::from(""))) } // https://w3c.github.io/FileAPI/#dfn-isClosed @@ -368,15 +357,20 @@ impl BlobMethods for Blob { } } -impl BlobBinding::BlobPropertyBag { - /// Get the normalized inner type string - /// https://w3c.github.io/FileAPI/#dfn-type - pub fn get_typestring(&self) -> String { - if is_ascii_printable(&self.type_) { - self.type_.to_lowercase() - } else { - "".to_string() - } +/// Get the normalized, MIME-parsable type string +/// https://w3c.github.io/FileAPI/#dfn-type +/// XXX: We will relax the restriction here, +/// since the spec has some problem over this part. +/// see https://github.com/w3c/FileAPI/issues/43 +fn normalize_type_string(s: &str) -> String { + if is_ascii_printable(s) { + let s_lower = s.to_lowercase(); + // match s_lower.parse() as Result<Mime, ()> { + // Ok(_) => s_lower, + // Err(_) => "".to_string() + s_lower + } else { + "".to_string() } } diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 87ac897a4e4..cf5537676e0 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -4,7 +4,7 @@ use devtools; use devtools_traits::DevtoolScriptControlMsg; -use dom::abstractworker::{WorkerScriptLoadOrigin, WorkerScriptMsg, SharedRt , SimpleWorkerErrorHandler}; +use dom::abstractworker::{WorkerScriptMsg, SharedRt , SimpleWorkerErrorHandler}; use dom::abstractworkerglobalscope::{SendableWorkerScriptChan, WorkerThreadWorkerChan}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::DedicatedWorkerGlobalScopeBinding; @@ -21,7 +21,6 @@ use dom::bindings::structuredclone::StructuredCloneData; use dom::messageevent::MessageEvent; use dom::worker::{TrustedWorkerAddress, WorkerMessageHandler}; use dom::workerglobalscope::WorkerGlobalScope; -use dom::workerglobalscope::WorkerGlobalScopeInit; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::router::ROUTER; use js::jsapi::{HandleValue, JS_SetInterruptCallback}; @@ -29,12 +28,13 @@ use js::jsapi::{JSAutoCompartment, JSContext}; use js::jsval::UndefinedValue; use js::rust::Runtime; use msg::constellation_msg::PipelineId; -use net_traits::{LoadContext, load_whole_resource, CustomResponse, IpcSend}; +use net_traits::{LoadContext, load_whole_resource, IpcSend}; use rand::random; use script_runtime::ScriptThreadEventCategory::WorkerEvent; use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort, StackRootTLS, get_reports, new_rt_and_cx}; -use script_traits::{TimerEvent, TimerSource}; +use script_traits::{TimerEvent, TimerSource, WorkerScriptLoadOrigin, WorkerGlobalScopeInit}; use std::mem::replace; +use std::sync::atomic::AtomicBool; use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel}; use std::sync::{Arc, Mutex}; use url::Url; @@ -70,8 +70,7 @@ impl<'a> Drop for AutoWorkerReset<'a> { enum MixedMessage { FromWorker((TrustedWorkerAddress, WorkerScriptMsg)), FromScheduler((TrustedWorkerAddress, TimerEvent)), - FromDevtools(DevtoolScriptControlMsg), - FromNetwork(IpcSender<Option<CustomResponse>>), + FromDevtools(DevtoolScriptControlMsg) } // https://html.spec.whatwg.org/multipage/#dedicatedworkerglobalscope @@ -102,14 +101,16 @@ impl DedicatedWorkerGlobalScope { own_sender: Sender<(TrustedWorkerAddress, WorkerScriptMsg)>, receiver: Receiver<(TrustedWorkerAddress, WorkerScriptMsg)>, timer_event_chan: IpcSender<TimerEvent>, - timer_event_port: Receiver<(TrustedWorkerAddress, TimerEvent)>) + timer_event_port: Receiver<(TrustedWorkerAddress, TimerEvent)>, + closing: Arc<AtomicBool>) -> DedicatedWorkerGlobalScope { DedicatedWorkerGlobalScope { workerglobalscope: WorkerGlobalScope::new_inherited(init, worker_url, runtime, from_devtools_receiver, - timer_event_chan), + timer_event_chan, + Some(closing)), id: id, receiver: receiver, own_sender: own_sender, @@ -128,7 +129,8 @@ impl DedicatedWorkerGlobalScope { own_sender: Sender<(TrustedWorkerAddress, WorkerScriptMsg)>, receiver: Receiver<(TrustedWorkerAddress, WorkerScriptMsg)>, timer_event_chan: IpcSender<TimerEvent>, - timer_event_port: Receiver<(TrustedWorkerAddress, TimerEvent)>) + timer_event_port: Receiver<(TrustedWorkerAddress, TimerEvent)>, + closing: Arc<AtomicBool>) -> Root<DedicatedWorkerGlobalScope> { let cx = runtime.cx(); let scope = box DedicatedWorkerGlobalScope::new_inherited(init, @@ -140,7 +142,8 @@ impl DedicatedWorkerGlobalScope { own_sender, receiver, timer_event_chan, - timer_event_port); + timer_event_port, + closing); DedicatedWorkerGlobalScopeBinding::Wrap(cx, scope) } @@ -154,7 +157,8 @@ impl DedicatedWorkerGlobalScope { parent_sender: Box<ScriptChan + Send>, own_sender: Sender<(TrustedWorkerAddress, WorkerScriptMsg)>, receiver: Receiver<(TrustedWorkerAddress, WorkerScriptMsg)>, - worker_load_origin: WorkerScriptLoadOrigin) { + worker_load_origin: WorkerScriptLoadOrigin, + closing: Arc<AtomicBool>) { let serialized_worker_url = worker_url.to_string(); let name = format!("WebWorker for {}", serialized_worker_url); let panic_chan = init.panic_chan.clone(); @@ -193,7 +197,7 @@ impl DedicatedWorkerGlobalScope { let global = DedicatedWorkerGlobalScope::new( init, url, id, devtools_mpsc_port, runtime, parent_sender.clone(), own_sender, receiver, - timer_ipc_chan, timer_rx); + timer_ipc_chan, timer_rx, closing); // FIXME(njn): workers currently don't have a unique ID suitable for using in reporter // registration (#6631), so we instead use a random number and cross our fingers. let scope = global.upcast::<WorkerGlobalScope>(); @@ -254,20 +258,17 @@ impl DedicatedWorkerGlobalScope { let worker_port = &self.receiver; let timer_event_port = &self.timer_event_port; let devtools_port = scope.from_devtools_receiver(); - let msg_port = scope.custom_message_port(); let sel = Select::new(); let mut worker_handle = sel.handle(worker_port); let mut timer_event_handle = sel.handle(timer_event_port); let mut devtools_handle = sel.handle(devtools_port); - let mut msg_port_handle = sel.handle(msg_port); unsafe { worker_handle.add(); timer_event_handle.add(); if scope.from_devtools_sender().is_some() { devtools_handle.add(); } - msg_port_handle.add(); } let ret = sel.wait(); if ret == worker_handle.id() { @@ -276,8 +277,6 @@ impl DedicatedWorkerGlobalScope { Ok(MixedMessage::FromScheduler(try!(timer_event_port.recv()))) } else if ret == devtools_handle.id() { Ok(MixedMessage::FromDevtools(try!(devtools_port.recv()))) - } else if ret == msg_port_handle.id() { - Ok(MixedMessage::FromNetwork(try!(msg_port.recv()))) } else { panic!("unexpected select result!") } @@ -339,10 +338,6 @@ impl DedicatedWorkerGlobalScope { MixedMessage::FromWorker((linked_worker, msg)) => { let _ar = AutoWorkerReset::new(self, linked_worker); self.handle_script_event(msg); - }, - MixedMessage::FromNetwork(network_sender) => { - // We send None as of now - let _ = network_sender.send(None); } } } diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 09d58c55e1e..37037d8b35a 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -123,8 +123,8 @@ use string_cache::{Atom, QualName}; use style::attr::AttrValue; use style::context::ReflowGoal; use style::restyle_hints::ElementSnapshot; -use style::servo::Stylesheet; use style::str::{split_html_space_chars, str_join}; +use style::stylesheets::Stylesheet; use time; use url::Url; use url::percent_encoding::percent_decode; @@ -1281,7 +1281,7 @@ impl Document { if PREFS.is_mozbrowser_enabled() { if let Some((containing_pipeline_id, subpage_id, _)) = self.window.parent_info() { let event = ConstellationMsg::MozBrowserEvent(containing_pipeline_id, - subpage_id, + Some(subpage_id), event); self.window.constellation_chan().send(event).unwrap(); } diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index e5a41965bba..4528a116e45 100644 --- a/components/script/dom/file.rs +++ b/components/script/dom/file.rs @@ -55,7 +55,7 @@ impl File { let global = GlobalRef::Window(window); File::new(global, BlobImpl::new_from_file(selected.id, selected.filename, selected.size), - name, Some(selected.modified as i64), "") + name, Some(selected.modified as i64), &selected.type_string) } // https://w3c.github.io/FileAPI/#file-constructor @@ -70,10 +70,10 @@ impl File { }; let ref blobPropertyBag = filePropertyBag.parent; - let typeString = blobPropertyBag.get_typestring(); + let ref typeString = blobPropertyBag.type_; let modified = filePropertyBag.lastModified; - Ok(File::new(global, BlobImpl::new_from_bytes(bytes), filename, modified, &typeString)) + Ok(File::new(global, BlobImpl::new_from_bytes(bytes), filename, modified, typeString)) } pub fn name(&self) -> &DOMString { diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 48947047e05..1b2001c08df 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -161,25 +161,11 @@ impl HTMLIFrameElement { #[allow(unsafe_code)] pub fn dispatch_mozbrowser_event(&self, event: MozBrowserEvent) { - // TODO(gw): Support mozbrowser event types that have detail which is not a string. - // See https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API - // for a list of mozbrowser events. assert!(PREFS.is_mozbrowser_enabled()); if self.Mozbrowser() { let window = window_from_node(self); - let custom_event = unsafe { - let cx = window.get_cx(); - let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get()); - rooted!(in(cx) let mut detail = UndefinedValue()); - let event_name = Atom::from(event.name()); - self.build_mozbrowser_event_detail(event, cx, detail.handle_mut()); - CustomEvent::new(GlobalRef::Window(window.r()), - event_name, - true, - true, - detail.handle()) - }; + let custom_event = build_mozbrowser_custom_event(&window, event); custom_event.upcast::<Event>().fire(self.upcast()); } } @@ -336,97 +322,104 @@ impl HTMLIFrameElementLayoutMethods for LayoutJS<HTMLIFrameElement> { } } -pub trait MozBrowserEventDetailBuilder { - #[allow(unsafe_code)] - unsafe fn build_mozbrowser_event_detail(&self, - event: MozBrowserEvent, - cx: *mut JSContext, - rval: MutableHandleValue); +#[allow(unsafe_code)] +pub fn build_mozbrowser_custom_event(window: &Window, event: MozBrowserEvent) -> Root<CustomEvent> { + // TODO(gw): Support mozbrowser event types that have detail which is not a string. + // See https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API + // for a list of mozbrowser events. + let cx = window.get_cx(); + let _ac = JSAutoCompartment::new(cx, window.reflector().get_jsobject().get()); + rooted!(in(cx) let mut detail = UndefinedValue()); + let event_name = Atom::from(event.name()); + unsafe { build_mozbrowser_event_detail(event, cx, detail.handle_mut()); } + CustomEvent::new(GlobalRef::Window(window), + event_name, + true, + true, + detail.handle()) } -impl MozBrowserEventDetailBuilder for HTMLIFrameElement { - #[allow(unsafe_code)] - unsafe fn build_mozbrowser_event_detail(&self, - event: MozBrowserEvent, - cx: *mut JSContext, - rval: MutableHandleValue) { - match event { - MozBrowserEvent::AsyncScroll | MozBrowserEvent::Close | MozBrowserEvent::ContextMenu | - MozBrowserEvent::LoadEnd | MozBrowserEvent::LoadStart | - MozBrowserEvent::Connected | MozBrowserEvent::OpenSearch | - MozBrowserEvent::UsernameAndPasswordRequired => { - rval.set(NullValue()); - } - MozBrowserEvent::Error(error_type, description, report) => { - BrowserElementErrorEventDetail { - type_: Some(DOMString::from(error_type.name())), - description: description.map(DOMString::from), - report: report.map(DOMString::from), - version: Some(DOMString::from_string(servo_version().into())), - }.to_jsval(cx, rval); - }, - MozBrowserEvent::SecurityChange(https_state) => { - BrowserElementSecurityChangeDetail { - // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsersecuritychange - state: Some(DOMString::from(match https_state { - HttpsState::Modern => "secure", - HttpsState::Deprecated => "broken", - HttpsState::None => "insecure", - }.to_owned())), - // FIXME - Not supported yet: - trackingContent: None, - mixedContent: None, - trackingState: None, - extendedValidation: None, - mixedState: None, - }.to_jsval(cx, rval); - } - MozBrowserEvent::TitleChange(ref string) => { - string.to_jsval(cx, rval); - } - MozBrowserEvent::LocationChange(url, can_go_back, can_go_forward) => { - BrowserElementLocationChangeEventDetail { - url: Some(DOMString::from(url)), - canGoBack: Some(can_go_back), - canGoForward: Some(can_go_forward), - }.to_jsval(cx, rval); - } - MozBrowserEvent::OpenTab(url) => { - BrowserElementOpenTabEventDetail { - url: Some(DOMString::from(url)), - }.to_jsval(cx, rval); - } - MozBrowserEvent::OpenWindow(url, target, features) => { - BrowserElementOpenWindowEventDetail { - url: Some(DOMString::from(url)), - target: target.map(DOMString::from), - features: features.map(DOMString::from), - }.to_jsval(cx, rval); - } - MozBrowserEvent::IconChange(rel, href, sizes) => { - BrowserElementIconChangeEventDetail { - rel: Some(DOMString::from(rel)), - href: Some(DOMString::from(href)), - sizes: Some(DOMString::from(sizes)), - }.to_jsval(cx, rval); - } - MozBrowserEvent::ShowModalPrompt(prompt_type, title, message, return_value) => { - BrowserShowModalPromptEventDetail { - promptType: Some(DOMString::from(prompt_type)), - title: Some(DOMString::from(title)), - message: Some(DOMString::from(message)), - returnValue: Some(DOMString::from(return_value)), - }.to_jsval(cx, rval) - } - MozBrowserEvent::VisibilityChange(visibility) => { - BrowserElementVisibilityChangeEventDetail { - visible: Some(visibility), - }.to_jsval(cx, rval); - } +#[allow(unsafe_code)] +unsafe fn build_mozbrowser_event_detail(event: MozBrowserEvent, + cx: *mut JSContext, + rval: MutableHandleValue) { + match event { + MozBrowserEvent::AsyncScroll | MozBrowserEvent::Close | MozBrowserEvent::ContextMenu | + MozBrowserEvent::LoadEnd | MozBrowserEvent::LoadStart | + MozBrowserEvent::Connected | MozBrowserEvent::OpenSearch | + MozBrowserEvent::UsernameAndPasswordRequired => { + rval.set(NullValue()); + } + MozBrowserEvent::Error(error_type, description, report) => { + BrowserElementErrorEventDetail { + type_: Some(DOMString::from(error_type.name())), + description: description.map(DOMString::from), + report: report.map(DOMString::from), + version: Some(DOMString::from_string(servo_version().into())), + }.to_jsval(cx, rval); + }, + MozBrowserEvent::SecurityChange(https_state) => { + BrowserElementSecurityChangeDetail { + // https://developer.mozilla.org/en-US/docs/Web/Events/mozbrowsersecuritychange + state: Some(DOMString::from(match https_state { + HttpsState::Modern => "secure", + HttpsState::Deprecated => "broken", + HttpsState::None => "insecure", + }.to_owned())), + // FIXME - Not supported yet: + trackingContent: None, + mixedContent: None, + trackingState: None, + extendedValidation: None, + mixedState: None, + }.to_jsval(cx, rval); + } + MozBrowserEvent::TitleChange(ref string) => { + string.to_jsval(cx, rval); + } + MozBrowserEvent::LocationChange(url, can_go_back, can_go_forward) => { + BrowserElementLocationChangeEventDetail { + url: Some(DOMString::from(url)), + canGoBack: Some(can_go_back), + canGoForward: Some(can_go_forward), + }.to_jsval(cx, rval); + } + MozBrowserEvent::OpenTab(url) => { + BrowserElementOpenTabEventDetail { + url: Some(DOMString::from(url)), + }.to_jsval(cx, rval); + } + MozBrowserEvent::OpenWindow(url, target, features) => { + BrowserElementOpenWindowEventDetail { + url: Some(DOMString::from(url)), + target: target.map(DOMString::from), + features: features.map(DOMString::from), + }.to_jsval(cx, rval); + } + MozBrowserEvent::IconChange(rel, href, sizes) => { + BrowserElementIconChangeEventDetail { + rel: Some(DOMString::from(rel)), + href: Some(DOMString::from(href)), + sizes: Some(DOMString::from(sizes)), + }.to_jsval(cx, rval); + } + MozBrowserEvent::ShowModalPrompt(prompt_type, title, message, return_value) => { + BrowserShowModalPromptEventDetail { + promptType: Some(DOMString::from(prompt_type)), + title: Some(DOMString::from(title)), + message: Some(DOMString::from(message)), + returnValue: Some(DOMString::from(return_value)), + }.to_jsval(cx, rval) + } + MozBrowserEvent::VisibilityChange(visibility) => { + BrowserElementVisibilityChangeEventDetail { + visible: Some(visibility), + }.to_jsval(cx, rval); } } } + pub fn Navigate(iframe: &HTMLIFrameElement, direction: NavigationDirection) -> ErrorResult { if iframe.Mozbrowser() { if iframe.upcast::<Node>().is_in_doc() { diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index b341ad59a1f..d089caed3f5 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -39,9 +39,8 @@ use string_cache::Atom; use style::attr::AttrValue; use style::media_queries::{MediaQueryList, parse_media_query_list}; use style::parser::ParserContextExtraData; -use style::servo::Stylesheet; use style::str::HTML_SPACE_CHARACTERS; -use style::stylesheets::Origin; +use style::stylesheets::{Stylesheet, Origin}; use url::Url; no_jsmanaged_fields!(Stylesheet); diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 9a4c394649a..7a94768c13a 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -801,6 +801,8 @@ impl PauseIfNotInDocumentTask { } impl Runnable for PauseIfNotInDocumentTask { + fn name(&self) -> &'static str { "PauseIfNotInDocumentTask" } + fn handler(self: Box<PauseIfNotInDocumentTask>) { let elem = self.elem.root(); if !elem.upcast::<Node>().is_in_doc() { diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 724534dfdb6..b8c2cd423fa 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -20,9 +20,8 @@ use std::ascii::AsciiExt; use std::sync::Arc; use string_cache::Atom; use style::attr::AttrValue; -use style::servo::Stylesheet; use style::str::HTML_SPACE_CHARACTERS; -use style::stylesheets::{CSSRule, Origin}; +use style::stylesheets::{Stylesheet, CSSRule, Origin}; use style::viewport::ViewportRule; #[dom_struct] diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index e253fab12be..c7cc4cc44a3 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -19,8 +19,7 @@ use std::sync::Arc; use string_cache::Atom; use style::media_queries::parse_media_query_list; use style::parser::ParserContextExtraData; -use style::servo::Stylesheet; -use style::stylesheets::Origin; +use style::stylesheets::{Stylesheet, Origin}; #[dom_struct] pub struct HTMLStyleElement { diff --git a/components/script/dom/serviceworker.rs b/components/script/dom/serviceworker.rs index ad303d45915..19af9b09ba4 100644 --- a/components/script/dom/serviceworker.rs +++ b/components/script/dom/serviceworker.rs @@ -2,8 +2,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +use dom::abstractworker::WorkerScriptMsg; use dom::abstractworker::{SimpleWorkerErrorHandler, WorkerErrorHandler}; -use dom::abstractworker::{WorkerScriptMsg, WorkerScriptLoadOrigin, SharedRt}; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::ServiceWorkerBinding::{ServiceWorkerMethods, ServiceWorkerState, Wrap}; @@ -13,19 +13,13 @@ use dom::bindings::js::Root; use dom::bindings::refcounted::Trusted; use dom::bindings::reflector::{Reflectable, reflect_dom_object}; use dom::bindings::str::{DOMString, USVString}; -use dom::client::Client; use dom::errorevent::ErrorEvent; use dom::event::{Event, EventBubbles, EventCancelable}; use dom::eventtarget::EventTarget; -use dom::serviceworkerglobalscope::ServiceWorkerGlobalScope; -use dom::workerglobalscope::prepare_workerscope_init; -use ipc_channel::ipc; use js::jsval::UndefinedValue; use script_thread::Runnable; use std::cell::Cell; -use std::sync::atomic::{AtomicBool, Ordering}; -use std::sync::mpsc::{Sender, channel}; -use std::sync::{Arc, Mutex}; +use std::sync::mpsc::Sender; use url::Url; pub type TrustedServiceWorkerAddress = Trusted<ServiceWorker>; @@ -35,36 +29,27 @@ pub struct ServiceWorker { eventtarget: EventTarget, script_url: DOMRefCell<String>, state: Cell<ServiceWorkerState>, - closing: Arc<AtomicBool>, #[ignore_heap_size_of = "Defined in std"] - sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, - #[ignore_heap_size_of = "Defined in rust-mozjs"] - runtime: Arc<Mutex<Option<SharedRt>>>, + sender: Option<Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>>, skip_waiting: Cell<bool> } impl ServiceWorker { - fn new_inherited(sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, - closing: Arc<AtomicBool>, - script_url: &str, + fn new_inherited(script_url: &str, skip_waiting: bool) -> ServiceWorker { ServiceWorker { eventtarget: EventTarget::new_inherited(), - closing: closing, - sender: sender, + sender: None, script_url: DOMRefCell::new(String::from(script_url)), state: Cell::new(ServiceWorkerState::Installing), - runtime: Arc::new(Mutex::new(None)), skip_waiting: Cell::new(skip_waiting) } } pub fn new(global: GlobalRef, - closing: Arc<AtomicBool>, - sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, script_url: &str, skip_waiting: bool) -> Root<ServiceWorker> { - reflect_dom_object(box ServiceWorker::new_inherited(sender, closing, script_url, skip_waiting), global, Wrap) + reflect_dom_object(box ServiceWorker::new_inherited(script_url, skip_waiting), global, Wrap) } pub fn dispatch_simple_error(address: TrustedServiceWorkerAddress) { @@ -72,23 +57,19 @@ impl ServiceWorker { service_worker.upcast().fire_simple_event("error"); } - pub fn is_closing(&self) -> bool { - self.closing.load(Ordering::SeqCst) - } - pub fn set_transition_state(&self, state: ServiceWorkerState) { self.state.set(state); self.upcast::<EventTarget>().fire_simple_event("statechange"); } + pub fn get_script_url(&self) -> Url { + Url::parse(&self.script_url.borrow().clone()).unwrap() + } + pub fn handle_error_message(address: TrustedServiceWorkerAddress, message: DOMString, filename: DOMString, lineno: u32, colno: u32) { let worker = address.root(); - if worker.is_closing() { - return; - } - let global = worker.r().global(); rooted!(in(global.r().get_cx()) let error = UndefinedValue()); let errorevent = ErrorEvent::new(global.r(), atom!("error"), @@ -97,42 +78,12 @@ impl ServiceWorker { errorevent.upcast::<Event>().fire(worker.upcast()); } - #[allow(unsafe_code)] - pub fn init_service_worker(global: GlobalRef, - script_url: Url, - skip_waiting: bool) -> Root<ServiceWorker> { - let (sender, receiver) = channel(); - let closing = Arc::new(AtomicBool::new(false)); - let worker = ServiceWorker::new(global, - closing.clone(), - sender.clone(), - script_url.as_str(), - skip_waiting); - let worker_ref = Trusted::new(worker.r()); - - let worker_load_origin = WorkerScriptLoadOrigin { - referrer_url: None, - referrer_policy: None, - request_source: global.request_source(), - pipeline_id: Some(global.pipeline()) - }; - - let (devtools_sender, devtools_receiver) = ipc::channel().unwrap(); - let init = prepare_workerscope_init(global, - "Service Worker".to_owned(), - script_url.clone(), - devtools_sender.clone(), - closing); - - // represents a service worker client - let sw_client = Client::new(global.as_window()); - let trusted_client = Trusted::new(&*sw_client); - - ServiceWorkerGlobalScope::run_serviceworker_scope( - init, script_url, global.pipeline(), devtools_receiver, worker.runtime.clone(), worker_ref, - global.script_chan(), sender, receiver, trusted_client, worker_load_origin); - - worker + pub fn install_serviceworker(global: GlobalRef, + script_url: Url, + skip_waiting: bool) -> Root<ServiceWorker> { + ServiceWorker::new(global, + script_url.as_str(), + skip_waiting) } } diff --git a/components/script/dom/serviceworkercontainer.rs b/components/script/dom/serviceworkercontainer.rs index 744daba7b91..17fea7100be 100644 --- a/components/script/dom/serviceworkercontainer.rs +++ b/components/script/dom/serviceworkercontainer.rs @@ -98,7 +98,7 @@ impl ServiceWorkerContainerMethods for ServiceWorkerContainer { script_url, scope_str.clone(), self); - ScriptThread::set_registration(scope, &*worker_registration); + ScriptThread::set_registration(scope, &*worker_registration, self.global().r().pipeline()); Ok(worker_registration) } } diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs index cbe195d1b8e..4841e0ff08a 100644 --- a/components/script/dom/serviceworkerglobalscope.rs +++ b/components/script/dom/serviceworkerglobalscope.rs @@ -4,8 +4,7 @@ use devtools; use devtools_traits::DevtoolScriptControlMsg; -use dom::abstractworker::{WorkerScriptLoadOrigin, WorkerScriptMsg, SharedRt, SimpleWorkerErrorHandler}; -use dom::abstractworkerglobalscope::{SendableWorkerScriptChan, WorkerThreadWorkerChan}; +use dom::abstractworker::WorkerScriptMsg; use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::ServiceWorkerGlobalScopeBinding; @@ -13,66 +12,34 @@ use dom::bindings::codegen::Bindings::ServiceWorkerGlobalScopeBinding::ServiceWo use dom::bindings::global::{GlobalRef, global_root_from_context}; use dom::bindings::inheritance::Castable; use dom::bindings::js::{Root, RootCollection}; -use dom::bindings::refcounted::{Trusted, LiveDOMReferences}; +use dom::bindings::refcounted::LiveDOMReferences; use dom::bindings::reflector::Reflectable; use dom::bindings::str::DOMString; -use dom::client::Client; use dom::messageevent::MessageEvent; use dom::serviceworker::TrustedServiceWorkerAddress; use dom::workerglobalscope::WorkerGlobalScope; -use dom::workerglobalscope::WorkerGlobalScopeInit; -use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; +use ipc_channel::ipc::{self, IpcSender, IpcReceiver}; use ipc_channel::router::ROUTER; use js::jsapi::{JS_SetInterruptCallback, JSAutoCompartment, JSContext}; use js::jsval::UndefinedValue; use js::rust::Runtime; use msg::constellation_msg::PipelineId; -use net_traits::{LoadContext, load_whole_resource, CustomResponse, IpcSend}; -use rand::random; -use script_runtime::ScriptThreadEventCategory::ServiceWorkerEvent; -use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort, StackRootTLS, get_reports, new_rt_and_cx}; -use script_traits::{TimerEvent, TimerSource}; -use std::mem::replace; +use net_traits::{LoadContext, load_whole_resource, IpcSend}; +use script_runtime::{CommonScriptMsg, StackRootTLS, get_reports, new_rt_and_cx}; +use script_traits::{TimerEvent, WorkerGlobalScopeInit, ScopeThings, ServiceWorkerMsg}; use std::sync::mpsc::{Receiver, RecvError, Select, Sender, channel}; -use std::sync::{Arc, Mutex}; -use std::time::Instant; +use std::thread; +use std::time::Duration; use url::Url; use util::prefs::PREFS; use util::thread::spawn_named; use util::thread_state; use util::thread_state::{IN_WORKER, SCRIPT}; -/// Set the `worker` field of a related ServiceWorkerGlobalScope object to a particular -/// value for the duration of this object's lifetime. This ensures that the related Worker -/// object only lives as long as necessary (ie. while events are being executed), while -/// providing a reference that can be cloned freely. -struct AutoWorkerReset<'a> { - workerscope: &'a ServiceWorkerGlobalScope, - old_worker: Option<TrustedServiceWorkerAddress>, -} - -impl<'a> AutoWorkerReset<'a> { - fn new(workerscope: &'a ServiceWorkerGlobalScope, - worker: TrustedServiceWorkerAddress) - -> AutoWorkerReset<'a> { - AutoWorkerReset { - workerscope: workerscope, - old_worker: replace(&mut *workerscope.worker.borrow_mut(), Some(worker)), - } - } -} - -impl<'a> Drop for AutoWorkerReset<'a> { - fn drop(&mut self) { - *self.workerscope.worker.borrow_mut() = self.old_worker.clone(); - } -} - -enum MixedMessage { +pub enum MixedMessage { FromServiceWorker((TrustedServiceWorkerAddress, WorkerScriptMsg)), - FromScheduler((TrustedServiceWorkerAddress, TimerEvent)), FromDevtools(DevtoolScriptControlMsg), - FromNetwork(IpcSender<Option<CustomResponse>>), + FromTimeoutThread(()), } #[dom_struct] @@ -84,14 +51,13 @@ pub struct ServiceWorkerGlobalScope { #[ignore_heap_size_of = "Defined in std"] own_sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, #[ignore_heap_size_of = "Defined in std"] - timer_event_port: Receiver<(TrustedServiceWorkerAddress, TimerEvent)>, + timer_event_port: Receiver<()>, #[ignore_heap_size_of = "Trusted<T> has unclear ownership like JS<T>"] worker: DOMRefCell<Option<TrustedServiceWorkerAddress>>, - #[ignore_heap_size_of = "Can't measure trait objects"] - /// Sender to the parent thread. - parent_sender: Box<ScriptChan + Send>, #[ignore_heap_size_of = "Defined in std"] - service_worker_client: Trusted<Client> + swmanager_sender: IpcSender<ServiceWorkerMsg>, + #[ignore_heap_size_of = "Defined in std"] + scope_url: Url } impl ServiceWorkerGlobalScope { @@ -100,26 +66,27 @@ impl ServiceWorkerGlobalScope { id: PipelineId, from_devtools_receiver: Receiver<DevtoolScriptControlMsg>, runtime: Runtime, - parent_sender: Box<ScriptChan + Send>, own_sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, receiver: Receiver<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, timer_event_chan: IpcSender<TimerEvent>, - timer_event_port: Receiver<(TrustedServiceWorkerAddress, TimerEvent)>, - client: Trusted<Client>) + timer_event_port: Receiver<()>, + swmanager_sender: IpcSender<ServiceWorkerMsg>, + scope_url: Url) -> ServiceWorkerGlobalScope { ServiceWorkerGlobalScope { workerglobalscope: WorkerGlobalScope::new_inherited(init, worker_url, runtime, from_devtools_receiver, - timer_event_chan), + timer_event_chan, + None), id: id, receiver: receiver, - own_sender: own_sender, timer_event_port: timer_event_port, - parent_sender: parent_sender, + own_sender: own_sender, worker: DOMRefCell::new(None), - service_worker_client: client + swmanager_sender: swmanager_sender, + scope_url: scope_url } } @@ -128,12 +95,12 @@ impl ServiceWorkerGlobalScope { id: PipelineId, from_devtools_receiver: Receiver<DevtoolScriptControlMsg>, runtime: Runtime, - parent_sender: Box<ScriptChan + Send>, own_sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, receiver: Receiver<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, timer_event_chan: IpcSender<TimerEvent>, - timer_event_port: Receiver<(TrustedServiceWorkerAddress, TimerEvent)>, - client: Trusted<Client>) + timer_event_port: Receiver<()>, + swmanager_sender: IpcSender<ServiceWorkerMsg>, + scope_url: Url) -> Root<ServiceWorkerGlobalScope> { let cx = runtime.cx(); let scope = box ServiceWorkerGlobalScope::new_inherited(init, @@ -141,42 +108,39 @@ impl ServiceWorkerGlobalScope { id, from_devtools_receiver, runtime, - parent_sender, own_sender, receiver, timer_event_chan, timer_event_port, - client); + swmanager_sender, + scope_url); ServiceWorkerGlobalScopeBinding::Wrap(cx, scope) } #[allow(unsafe_code)] - pub fn run_serviceworker_scope(init: WorkerGlobalScopeInit, - worker_url: Url, - id: PipelineId, - from_devtools_receiver: IpcReceiver<DevtoolScriptControlMsg>, - main_thread_rt: Arc<Mutex<Option<SharedRt>>>, - worker: TrustedServiceWorkerAddress, - parent_sender: Box<ScriptChan + Send>, + pub fn run_serviceworker_scope(scope_things: ScopeThings, own_sender: Sender<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, receiver: Receiver<(TrustedServiceWorkerAddress, WorkerScriptMsg)>, - client: Trusted<Client>, - worker_load_origin: WorkerScriptLoadOrigin) { - let serialized_worker_url = worker_url.to_string(); + devtools_receiver: IpcReceiver<DevtoolScriptControlMsg>, + swmanager_sender: IpcSender<ServiceWorkerMsg>, + scope_url: Url) { + let ScopeThings { script_url, + pipeline_id, + init, + worker_load_origin, + .. } = scope_things; + + let serialized_worker_url = script_url.to_string(); spawn_named(format!("ServiceWorker for {}", serialized_worker_url), move || { thread_state::initialize(SCRIPT | IN_WORKER); - let roots = RootCollection::new(); let _stack_roots_tls = StackRootTLS::new(&roots); - let (url, source) = match load_whole_resource(LoadContext::Script, &init.resource_threads.sender(), - worker_url, + script_url, &worker_load_origin) { Err(_) => { println!("error loading script {}", serialized_worker_url); - parent_sender.send(CommonScriptMsg::RunnableMsg(ServiceWorkerEvent, - box SimpleWorkerErrorHandler::new(worker))).unwrap(); return; } Ok((metadata, bytes)) => { @@ -185,25 +149,18 @@ impl ServiceWorkerGlobalScope { }; let runtime = unsafe { new_rt_and_cx() }; - *main_thread_rt.lock().unwrap() = Some(SharedRt::new(&runtime)); let (devtools_mpsc_chan, devtools_mpsc_port) = channel(); - ROUTER.route_ipc_receiver_to_mpsc_sender(from_devtools_receiver, devtools_mpsc_chan); + ROUTER.route_ipc_receiver_to_mpsc_sender(devtools_receiver, devtools_mpsc_chan); - let (timer_tx, timer_rx) = channel(); - let (timer_ipc_chan, timer_ipc_port) = ipc::channel().unwrap(); - let worker_for_route = worker.clone(); - ROUTER.add_route(timer_ipc_port.to_opaque(), box move |message| { - let event = message.to().unwrap(); - timer_tx.send((worker_for_route.clone(), event)).unwrap(); - }); + // TODO XXXcreativcoder use this timer_ipc_port, when we have a service worker instance here + let (timer_ipc_chan, _timer_ipc_port) = ipc::channel().unwrap(); + let (timer_chan, timer_port) = channel(); let global = ServiceWorkerGlobalScope::new( - init, url, id, devtools_mpsc_port, runtime, - parent_sender.clone(), own_sender, receiver, - timer_ipc_chan, timer_rx, client); - // FIXME(njn): workers currently don't have a unique ID suitable for using in reporter - // registration (#6631), so we instead use a random number and cross our fingers. + init, url, pipeline_id, devtools_mpsc_port, runtime, + own_sender, receiver, + timer_ipc_chan, timer_port, swmanager_sender, scope_url); let scope = global.upcast::<WorkerGlobalScope>(); unsafe { @@ -211,35 +168,25 @@ impl ServiceWorkerGlobalScope { JS_SetInterruptCallback(scope.runtime(), Some(interrupt_callback)); } - if scope.is_closing() { - return; - } + scope.execute_script(DOMString::from(source)); - { - let _ar = AutoWorkerReset::new(global.r(), worker); - scope.execute_script(DOMString::from(source)); - } - - - let reporter_name = format!("service-worker-reporter-{}", random::<u64>()); - scope.mem_profiler_chan().run_with_memory_reporting(|| { - // Service workers are time limited - let sw_lifetime = Instant::now(); + // Service workers are time limited + spawn_named("SWTimeoutThread".to_owned(), move || { let sw_lifetime_timeout = PREFS.get("dom.serviceworker.timeout_seconds").as_u64().unwrap(); - while let Ok(event) = global.receive_event() { - if scope.is_closing() { - break; - } - global.handle_event(event); - if sw_lifetime.elapsed().as_secs() == sw_lifetime_timeout { - break; - } + thread::sleep(Duration::new(sw_lifetime_timeout, 0)); + let _ = timer_chan.send(()); + }); + + // TODO XXXcreativcoder bring back run_with_memory_reporting when things are more concrete here. + while let Ok(event) = global.receive_event() { + if !global.handle_event(event) { + break; } - }, reporter_name, parent_sender, CommonScriptMsg::CollectReports); + } }); } - fn handle_event(&self, event: MixedMessage) { + fn handle_event(&self, event: MixedMessage) -> bool { match event { MixedMessage::FromDevtools(msg) => { let global_ref = GlobalRef::Worker(self.upcast()); @@ -252,26 +199,15 @@ impl ServiceWorkerGlobalScope { devtools::handle_wants_live_notifications(&global_ref, bool_val), _ => debug!("got an unusable devtools control message inside the worker!"), } - }, - MixedMessage::FromScheduler((linked_worker, timer_event)) => { - match timer_event { - TimerEvent(TimerSource::FromWorker, id) => { - let _ar = AutoWorkerReset::new(self, linked_worker); - let scope = self.upcast::<WorkerGlobalScope>(); - scope.handle_fire_timer(id); - }, - TimerEvent(_, _) => { - panic!("The service worker received a TimerEvent from a window.") - } - } + true } - MixedMessage::FromServiceWorker((linked_worker, msg)) => { - let _ar = AutoWorkerReset::new(self, linked_worker); + MixedMessage::FromServiceWorker((_, msg)) => { self.handle_script_event(msg); - }, - MixedMessage::FromNetwork(network_sender) => { - // We send None as of now - let _ = network_sender.send(None); + true + } + MixedMessage::FromTimeoutThread(_) => { + let _ = self.swmanager_sender.send(ServiceWorkerMsg::Timeout(self.scope_url.clone())); + false } } } @@ -307,44 +243,33 @@ impl ServiceWorkerGlobalScope { fn receive_event(&self) -> Result<MixedMessage, RecvError> { let scope = self.upcast::<WorkerGlobalScope>(); let worker_port = &self.receiver; - let timer_event_port = &self.timer_event_port; let devtools_port = scope.from_devtools_receiver(); - let msg_port = scope.custom_message_port(); + let timer_event_port = &self.timer_event_port; let sel = Select::new(); let mut worker_handle = sel.handle(worker_port); - let mut timer_event_handle = sel.handle(timer_event_port); let mut devtools_handle = sel.handle(devtools_port); - let mut msg_port_handle = sel.handle(msg_port); + let mut timer_port_handle = sel.handle(timer_event_port); unsafe { worker_handle.add(); - timer_event_handle.add(); if scope.from_devtools_sender().is_some() { devtools_handle.add(); } - msg_port_handle.add(); + timer_port_handle.add(); } + let ret = sel.wait(); if ret == worker_handle.id() { Ok(MixedMessage::FromServiceWorker(try!(worker_port.recv()))) - } else if ret == timer_event_handle.id() { - Ok(MixedMessage::FromScheduler(try!(timer_event_port.recv()))) - } else if ret == devtools_handle.id() { + }else if ret == devtools_handle.id() { Ok(MixedMessage::FromDevtools(try!(devtools_port.recv()))) - } else if ret == msg_port_handle.id() { - Ok(MixedMessage::FromNetwork(try!(msg_port.recv()))) + } else if ret == timer_port_handle.id() { + Ok(MixedMessage::FromTimeoutThread(try!(timer_event_port.recv()))) } else { panic!("unexpected select result!") } } - pub fn script_chan(&self) -> Box<ScriptChan + Send> { - box WorkerThreadWorkerChan { - sender: self.own_sender.clone(), - worker: self.worker.borrow().as_ref().unwrap().clone(), - } - } - pub fn pipeline(&self) -> PipelineId { self.id } @@ -352,15 +277,6 @@ impl ServiceWorkerGlobalScope { pub fn process_event(&self, msg: CommonScriptMsg) { self.handle_script_event(WorkerScriptMsg::Common(msg)); } - - pub fn new_script_pair(&self) -> (Box<ScriptChan + Send>, Box<ScriptPort + Send>) { - let (tx, rx) = channel(); - let chan = box SendableWorkerScriptChan { - sender: tx, - worker: self.worker.borrow().as_ref().unwrap().clone(), - }; - (chan, box rx) - } } #[allow(unsafe_code)] diff --git a/components/script/dom/serviceworkerregistration.rs b/components/script/dom/serviceworkerregistration.rs index 358331afffc..e20b7e06c47 100644 --- a/components/script/dom/serviceworkerregistration.rs +++ b/components/script/dom/serviceworkerregistration.rs @@ -11,6 +11,8 @@ use dom::bindings::str::USVString; use dom::eventtarget::EventTarget; use dom::serviceworker::ServiceWorker; use dom::serviceworkercontainer::Controllable; +use dom::workerglobalscope::prepare_workerscope_init; +use script_traits::{WorkerScriptLoadOrigin, ScopeThings}; use url::Url; #[dom_struct] @@ -19,7 +21,7 @@ pub struct ServiceWorkerRegistration { active: Option<JS<ServiceWorker>>, installing: Option<JS<ServiceWorker>>, waiting: Option<JS<ServiceWorker>>, - scope: String, + scope: String } impl ServiceWorkerRegistration { @@ -29,7 +31,7 @@ impl ServiceWorkerRegistration { active: Some(JS::from_ref(active_sw)), installing: None, waiting: None, - scope: scope + scope: scope, } } #[allow(unrooted_must_root)] @@ -37,11 +39,47 @@ impl ServiceWorkerRegistration { script_url: Url, scope: String, container: &Controllable) -> Root<ServiceWorkerRegistration> { - let active_worker = ServiceWorker::init_service_worker(global, script_url, true); + let active_worker = ServiceWorker::install_serviceworker(global, script_url.clone(), true); active_worker.set_transition_state(ServiceWorkerState::Installed); container.set_controller(&*active_worker.clone()); reflect_dom_object(box ServiceWorkerRegistration::new_inherited(&*active_worker, scope), global, Wrap) } + + pub fn get_installed(&self) -> &ServiceWorker { + self.active.as_ref().unwrap() + } + + pub fn create_scope_things(global: GlobalRef, script_url: Url) -> ScopeThings { + let worker_load_origin = WorkerScriptLoadOrigin { + referrer_url: None, + referrer_policy: None, + pipeline_id: Some(global.pipeline()) + }; + + let worker_id = global.get_next_worker_id(); + let init = prepare_workerscope_init(global, None); + ScopeThings { + script_url: script_url, + pipeline_id: global.pipeline(), + init: init, + worker_load_origin: worker_load_origin, + devtools_chan: global.devtools_chan(), + worker_id: worker_id + } + } +} + +pub fn longest_prefix_match(stored_scope: &Url, potential_match: &Url) -> bool { + if stored_scope.origin() != potential_match.origin() { + return false; + } + let scope_chars = stored_scope.path().chars(); + let matching_chars = potential_match.path().chars(); + if scope_chars.count() > matching_chars.count() { + return false; + } + + stored_scope.path().chars().zip(potential_match.path().chars()).all(|(scope, matched)| scope == matched) } impl ServiceWorkerRegistrationMethods for ServiceWorkerRegistration { diff --git a/components/script/dom/webidls/ServiceWorkerGlobalScope.webidl b/components/script/dom/webidls/ServiceWorkerGlobalScope.webidl index cbe028c129b..35e4b98f9d5 100644 --- a/components/script/dom/webidls/ServiceWorkerGlobalScope.webidl +++ b/components/script/dom/webidls/ServiceWorkerGlobalScope.webidl @@ -4,7 +4,8 @@ // https://slightlyoff.github.io/ServiceWorker/spec/service_worker/#service-worker-global-scope -[Global=(Worker,ServiceWorker), Pref="dom.serviceworker.enabled"] +[Global=(Worker,ServiceWorker), Exposed=ServiceWorker, + Pref="dom.serviceworker.enabled"] interface ServiceWorkerGlobalScope : WorkerGlobalScope { // A container for a list of Client objects that correspond to // browsing contexts (or shared workers) that are on the origin of this SW diff --git a/components/script/dom/webidls/WorkerGlobalScope.webidl b/components/script/dom/webidls/WorkerGlobalScope.webidl index 0a269068b57..ec65bcb09a6 100644 --- a/components/script/dom/webidls/WorkerGlobalScope.webidl +++ b/components/script/dom/webidls/WorkerGlobalScope.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://html.spec.whatwg.org/multipage/#workerglobalscope -[Abstract, Exposed=(Window,Worker)] +[Abstract, Exposed=Worker] interface WorkerGlobalScope : EventTarget { [BinaryName="Self_"] readonly attribute WorkerGlobalScope self; readonly attribute WorkerLocation location; @@ -16,7 +16,7 @@ interface WorkerGlobalScope : EventTarget { }; // https://html.spec.whatwg.org/multipage/#WorkerGlobalScope-partial -[Exposed=(Window,Worker)] +[Exposed=Worker] partial interface WorkerGlobalScope { // not obsolete [Throws] void importScripts(DOMString... urls); @@ -26,7 +26,7 @@ WorkerGlobalScope implements WindowTimers; WorkerGlobalScope implements WindowBase64; // Proprietary -[Exposed=(Window,Worker)] +[Exposed=Worker] partial interface WorkerGlobalScope { [Replaceable] readonly attribute Console console; diff --git a/components/script/dom/webidls/WorkerLocation.webidl b/components/script/dom/webidls/WorkerLocation.webidl index 797956aca26..e4c410f720a 100644 --- a/components/script/dom/webidls/WorkerLocation.webidl +++ b/components/script/dom/webidls/WorkerLocation.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://html.spec.whatwg.org/multipage/#worker-locations -[Exposed=(Window,Worker)] +[Exposed=Worker] interface WorkerLocation { /*stringifier*/ readonly attribute USVString href; // readonly attribute USVString origin; diff --git a/components/script/dom/webidls/WorkerNavigator.webidl b/components/script/dom/webidls/WorkerNavigator.webidl index 04006714a0c..0661325b8be 100644 --- a/components/script/dom/webidls/WorkerNavigator.webidl +++ b/components/script/dom/webidls/WorkerNavigator.webidl @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://html.spec.whatwg.org/multipage/#workernavigator -[Exposed=(Window,Worker)] +[Exposed=Worker] interface WorkerNavigator {}; WorkerNavigator implements NavigatorID; WorkerNavigator implements NavigatorLanguage; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 30ab695f9b7..4878f33f994 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -28,7 +28,9 @@ use dom::crypto::Crypto; use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration}; use dom::document::Document; use dom::element::Element; +use dom::event::Event; use dom::eventtarget::EventTarget; +use dom::htmliframeelement::build_mozbrowser_custom_event; use dom::location::Location; use dom::navigator::Navigator; use dom::node::{Node, from_untrusted_node_address, window_from_node}; @@ -44,10 +46,10 @@ use js::rust::CompileOptionsWrapper; use js::rust::Runtime; use libc; use msg::constellation_msg::{FrameType, LoadData, PanicMsg, PipelineId, SubpageId, WindowSizeType}; +use net_traits::ResourceThreads; use net_traits::bluetooth_thread::BluetoothMethodMsg; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheThread}; use net_traits::storage_thread::StorageType; -use net_traits::{ResourceThreads, CustomResponseSender}; use num_traits::ToPrimitive; use open; use profile_traits::mem; @@ -63,7 +65,7 @@ use script_runtime::{ScriptChan, ScriptPort, maybe_take_panic_result}; use script_thread::SendableMainThreadScriptChan; use script_thread::{MainThreadScriptChan, MainThreadScriptMsg, RunnableWrapper}; use script_traits::webdriver_msg::{WebDriverJSError, WebDriverJSResult}; -use script_traits::{ConstellationControlMsg, UntrustedNodeAddress}; +use script_traits::{ConstellationControlMsg, MozBrowserEvent, UntrustedNodeAddress}; use script_traits::{DocumentState, MsDuration, TimerEvent, TimerEventId}; use script_traits::{ScriptMsg as ConstellationMsg, TimerEventRequest, TimerSource, WindowSizeData}; use std::ascii::AsciiExt; @@ -155,8 +157,6 @@ pub struct Window { image_cache_thread: ImageCacheThread, #[ignore_heap_size_of = "channels are hard"] image_cache_chan: ImageCacheChan, - #[ignore_heap_size_of = "channels are hard"] - custom_message_chan: IpcSender<CustomResponseSender>, browsing_context: MutNullableHeap<JS<BrowsingContext>>, performance: MutNullableHeap<JS<Performance>>, navigation_start: u64, @@ -314,10 +314,6 @@ impl Window { self.image_cache_chan.clone() } - pub fn custom_message_chan(&self) -> IpcSender<CustomResponseSender> { - self.custom_message_chan.clone() - } - pub fn get_next_worker_id(&self) -> WorkerId { let worker_id = self.next_worker_id.get(); let WorkerId(id_num) = worker_id; @@ -1594,6 +1590,13 @@ impl Window { _ => false, } } + + #[allow(unsafe_code)] + pub fn dispatch_mozbrowser_event(&self, event: MozBrowserEvent) { + assert!(PREFS.is_mozbrowser_enabled()); + let custom_event = build_mozbrowser_custom_event(&self, event); + custom_event.upcast::<Event>().fire(self.upcast()); + } } impl Window { @@ -1605,7 +1608,6 @@ impl Window { history_task_source: HistoryTraversalTaskSource, file_task_source: FileReadingTaskSource, image_cache_chan: ImageCacheChan, - custom_message_chan: IpcSender<CustomResponseSender>, image_cache_thread: ImageCacheThread, resource_threads: ResourceThreads, bluetooth_thread: IpcSender<BluetoothMethodMsg>, @@ -1641,7 +1643,6 @@ impl Window { history_traversal_task_source: history_task_source, file_reading_task_source: file_task_source, image_cache_chan: image_cache_chan, - custom_message_chan: custom_message_chan, console: Default::default(), crypto: Default::default(), navigator: Default::default(), diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 2cf1d1c4e46..c318672fb7a 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -2,9 +2,9 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - +use devtools_traits::{ScriptToDevtoolsControlMsg, DevtoolsPageInfo}; +use dom::abstractworker::WorkerScriptMsg; use dom::abstractworker::{SimpleWorkerErrorHandler, SharedRt, WorkerErrorHandler}; -use dom::abstractworker::{WorkerScriptLoadOrigin, WorkerScriptMsg}; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::WorkerBinding; use dom::bindings::codegen::Bindings::WorkerBinding::WorkerMethods; @@ -26,6 +26,7 @@ use ipc_channel::ipc; use js::jsapi::{HandleValue, JSContext, JSAutoCompartment}; use js::jsval::UndefinedValue; use script_thread::Runnable; +use script_traits::WorkerScriptLoadOrigin; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc::{Sender, channel}; use std::sync::{Arc, Mutex}; @@ -81,21 +82,28 @@ impl Worker { let worker_load_origin = WorkerScriptLoadOrigin { referrer_url: None, referrer_policy: None, - request_source: global.request_source(), pipeline_id: Some(global.pipeline()) }; let (devtools_sender, devtools_receiver) = ipc::channel().unwrap(); + let worker_id = global.get_next_worker_id(); + if let Some(ref chan) = global.devtools_chan() { + let pipeline_id = global.pipeline(); + let title = format!("Worker for {}", worker_url); + let page_info = DevtoolsPageInfo { + title: title, + url: worker_url.clone(), + }; + let _ = chan.send(ScriptToDevtoolsControlMsg::NewGlobal((pipeline_id, Some(worker_id)), + devtools_sender.clone(), + page_info)); + } - let init = prepare_workerscope_init(global, - "Worker".to_owned(), - worker_url.clone(), - devtools_sender.clone(), - closing); + let init = prepare_workerscope_init(global, Some(devtools_sender)); DedicatedWorkerGlobalScope::run_worker_scope( init, worker_url, global.pipeline(), devtools_receiver, worker.runtime.clone(), worker_ref, - global.script_chan(), sender, receiver, worker_load_origin); + global.script_chan(), sender, receiver, worker_load_origin, closing); Ok(worker) } diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index 67b7a54951d..cd8476b49d6 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId, DevtoolsPageInfo}; +use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId}; use dom::bindings::codegen::Bindings::FunctionBinding::Function; use dom::bindings::codegen::Bindings::WorkerGlobalScopeBinding::WorkerGlobalScopeMethods; use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception}; @@ -19,18 +19,18 @@ use dom::serviceworkerglobalscope::ServiceWorkerGlobalScope; use dom::window::{base64_atob, base64_btoa}; use dom::workerlocation::WorkerLocation; use dom::workernavigator::WorkerNavigator; -use ipc_channel::ipc::{self, IpcSender}; -use ipc_channel::router::ROUTER; +use ipc_channel::ipc::IpcSender; use js::jsapi::{HandleValue, JSContext, JSRuntime}; use js::jsval::UndefinedValue; use js::rust::Runtime; use msg::constellation_msg::{PipelineId, ReferrerPolicy, PanicMsg}; use net_traits::{LoadContext, ResourceThreads, load_whole_resource}; -use net_traits::{RequestSource, LoadOrigin, CustomResponseSender, IpcSend}; +use net_traits::{LoadOrigin, IpcSend}; use profile_traits::{mem, time}; use script_runtime::{CommonScriptMsg, ScriptChan, ScriptPort, maybe_take_panic_result}; use script_thread::RunnableWrapper; use script_traits::ScriptMsg as ConstellationMsg; +use script_traits::WorkerGlobalScopeInit; use script_traits::{MsDuration, TimerEvent, TimerEventId, TimerEventRequest, TimerSource}; use std::cell::Cell; use std::default::Default; @@ -48,52 +48,19 @@ pub enum WorkerGlobalScopeTypeId { DedicatedWorkerGlobalScope, } -pub struct WorkerGlobalScopeInit { - pub resource_threads: ResourceThreads, - pub mem_profiler_chan: mem::ProfilerChan, - pub time_profiler_chan: time::ProfilerChan, - pub to_devtools_sender: Option<IpcSender<ScriptToDevtoolsControlMsg>>, - pub from_devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>, - pub constellation_chan: IpcSender<ConstellationMsg>, - pub scheduler_chan: IpcSender<TimerEventRequest>, - pub panic_chan: IpcSender<PanicMsg>, - pub worker_id: WorkerId, - pub closing: Arc<AtomicBool>, -} - pub fn prepare_workerscope_init(global: GlobalRef, - worker_type: String, - worker_url: Url, - devtools_sender: IpcSender<DevtoolScriptControlMsg>, - closing: Arc<AtomicBool>) -> WorkerGlobalScopeInit { + devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>) -> WorkerGlobalScopeInit { let worker_id = global.get_next_worker_id(); - let optional_sender = match global.devtools_chan() { - Some(ref chan) => { - let pipeline_id = global.pipeline(); - let title = format!("{} for {}", worker_type, worker_url); - let page_info = DevtoolsPageInfo { - title: title, - url: worker_url, - }; - chan.send(ScriptToDevtoolsControlMsg::NewGlobal((pipeline_id, Some(worker_id)), - devtools_sender.clone(), - page_info)).unwrap(); - Some(devtools_sender) - }, - None => None, - }; - let init = WorkerGlobalScopeInit { resource_threads: global.resource_threads(), mem_profiler_chan: global.mem_profiler_chan().clone(), to_devtools_sender: global.devtools_chan(), time_profiler_chan: global.time_profiler_chan().clone(), - from_devtools_sender: optional_sender, + from_devtools_sender: devtools_sender, constellation_chan: global.constellation_chan().clone(), panic_chan: global.panic_chan().clone(), scheduler_chan: global.scheduler_chan().clone(), - worker_id: worker_id, - closing: closing, + worker_id: worker_id }; init @@ -105,7 +72,7 @@ pub struct WorkerGlobalScope { eventtarget: EventTarget, worker_id: WorkerId, worker_url: Url, - closing: Arc<AtomicBool>, + closing: Option<Arc<AtomicBool>>, #[ignore_heap_size_of = "Defined in js"] runtime: Runtime, next_worker_id: Cell<WorkerId>, @@ -146,12 +113,6 @@ pub struct WorkerGlobalScope { #[ignore_heap_size_of = "Defined in ipc-channel"] panic_chan: IpcSender<PanicMsg>, - - #[ignore_heap_size_of = "Defined in ipc-channel"] - custom_msg_chan: IpcSender<CustomResponseSender>, - - #[ignore_heap_size_of = "Defined in std"] - custom_msg_port: Receiver<CustomResponseSender>, } impl WorkerGlobalScope { @@ -159,16 +120,15 @@ impl WorkerGlobalScope { worker_url: Url, runtime: Runtime, from_devtools_receiver: Receiver<DevtoolScriptControlMsg>, - timer_event_chan: IpcSender<TimerEvent>) + timer_event_chan: IpcSender<TimerEvent>, + closing: Option<Arc<AtomicBool>>) -> WorkerGlobalScope { - let (msg_chan, msg_port) = ipc::channel().unwrap(); - let custom_msg_port = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(msg_port); WorkerGlobalScope { eventtarget: EventTarget::new_inherited(), next_worker_id: Cell::new(WorkerId(0)), worker_id: init.worker_id, worker_url: worker_url, - closing: init.closing, + closing: closing, runtime: runtime, resource_threads: init.resource_threads, location: Default::default(), @@ -185,8 +145,6 @@ impl WorkerGlobalScope { constellation_chan: init.constellation_chan, scheduler_chan: init.scheduler_chan, panic_chan: init.panic_chan, - custom_msg_chan: msg_chan, - custom_msg_port: custom_msg_port } } @@ -236,16 +194,12 @@ impl WorkerGlobalScope { self.runtime.cx() } - pub fn custom_message_chan(&self) -> IpcSender<CustomResponseSender> { - self.custom_msg_chan.clone() - } - - pub fn custom_message_port(&self) -> &Receiver<CustomResponseSender> { - &self.custom_msg_port - } - pub fn is_closing(&self) -> bool { - self.closing.load(Ordering::SeqCst) + if let Some(ref closing) = self.closing { + closing.load(Ordering::SeqCst) + } else { + false + } } pub fn resource_threads(&self) -> &ResourceThreads { @@ -273,7 +227,7 @@ impl WorkerGlobalScope { pub fn get_runnable_wrapper(&self) -> RunnableWrapper { RunnableWrapper { - cancelled: self.closing.clone(), + cancelled: self.closing.clone().unwrap(), } } } @@ -285,9 +239,6 @@ impl LoadOrigin for WorkerGlobalScope { fn referrer_policy(&self) -> Option<ReferrerPolicy> { None } - fn request_source(&self) -> RequestSource { - RequestSource::None - } fn pipeline_id(&self) -> Option<PipelineId> { Some(self.pipeline()) } @@ -451,13 +402,10 @@ impl WorkerGlobalScope { pub fn script_chan(&self) -> Box<ScriptChan + Send> { let dedicated = self.downcast::<DedicatedWorkerGlobalScope>(); - let service_worker = self.downcast::<ServiceWorkerGlobalScope>(); if let Some(dedicated) = dedicated { return dedicated.script_chan(); - } else if let Some(service_worker) = service_worker { - return service_worker.script_chan(); } else { - panic!("need to implement a sender for SharedWorker") + panic!("need to implement a sender for SharedWorker/ServiceWorker") } } @@ -479,13 +427,10 @@ impl WorkerGlobalScope { pub fn new_script_pair(&self) -> (Box<ScriptChan + Send>, Box<ScriptPort + Send>) { let dedicated = self.downcast::<DedicatedWorkerGlobalScope>(); - let service_worker = self.downcast::<ServiceWorkerGlobalScope>(); if let Some(dedicated) = dedicated { return dedicated.new_script_pair(); - } else if let Some(service_worker) = service_worker { - return service_worker.new_script_pair(); } else { - panic!("need to implement a sender for SharedWorker") + panic!("need to implement a sender for SharedWorker/ServiceWorker") } } diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index ed254f8c007..9ac02936673 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -47,7 +47,7 @@ use net_traits::CoreResourceMsg::Fetch; use net_traits::request::{CredentialsMode, Destination, RequestInit, RequestMode}; use net_traits::trim_http_whitespace; use net_traits::{CoreResourceThread, LoadOrigin}; -use net_traits::{FetchResponseListener, Metadata, NetworkError, RequestSource}; +use net_traits::{FetchResponseListener, Metadata, NetworkError}; use network_listener::{NetworkListener, PreInvoke}; use parse::html::{ParseContext, parse_html}; use parse::xml::{self, parse_xml}; @@ -274,13 +274,6 @@ impl LoadOrigin for XMLHttpRequest { fn referrer_policy(&self) -> Option<ReferrerPolicy> { return self.referrer_policy; } - fn request_source(&self) -> RequestSource { - if self.sync.get() { - RequestSource::None - } else { - self.global().r().request_source() - } - } fn pipeline_id(&self) -> Option<PipelineId> { let global = self.global(); Some(global.r().pipeline()) |