diff options
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/htmllinkelement.rs | 1 | ||||
| -rw-r--r-- | components/script/dom/htmlmediaelement.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/htmlscriptelement.rs | 1 | ||||
| -rw-r--r-- | components/script/dom/window.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 1 | ||||
| -rw-r--r-- | components/script/network_listener.rs | 18 | ||||
| -rw-r--r-- | components/script/script_thread.rs | 3 |
7 files changed, 23 insertions, 7 deletions
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index ed6754afde6..ea5c25d8d46 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -226,6 +226,7 @@ impl HTMLLinkElement { let listener = NetworkListener { context: context, script_chan: document.window().networking_task_source(), + wrapper: Some(document.window().get_runnable_wrapper()), }; let response_target = AsyncResponseTarget { sender: action_sender, diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 7cfe19ba789..877a98311c4 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -473,10 +473,12 @@ impl HTMLMediaElement { // 4.2 let context = Arc::new(Mutex::new(HTMLMediaElementContext::new(self, url.clone()))); let (action_sender, action_receiver) = ipc::channel().unwrap(); - let script_chan = window_from_node(self).networking_task_source(); + let window = window_from_node(self); + let script_chan = window.networking_task_source(); let listener = box NetworkListener { context: context, script_chan: script_chan, + wrapper: Some(window.get_runnable_wrapper()), }; let response_target = AsyncResponseTarget { diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index e4ce7fb068f..2d10e5f43d8 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -308,6 +308,7 @@ impl HTMLScriptElement { let listener = NetworkListener { context: context, script_chan: doc.window().networking_task_source(), + wrapper: Some(doc.window().get_runnable_wrapper()), }; let response_target = AsyncResponseTarget { sender: action_sender, diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 3420244a20e..9401eae5a46 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -949,7 +949,7 @@ impl Window { self.current_state.set(WindowState::Zombie); *self.js_runtime.borrow_mut() = None; self.browsing_context.set(None); - self.ignore_further_async_events.store(true, Ordering::Relaxed); + self.ignore_further_async_events.store(true, Ordering::SeqCst); } /// https://drafts.csswg.org/cssom-view/#dom-window-scroll diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index e76bbd0c7b3..148a51c8c6b 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -258,6 +258,7 @@ impl XMLHttpRequest { let listener = NetworkListener { context: context, script_chan: script_chan, + wrapper: None, }; ROUTER.add_route(action_receiver.to_opaque(), box move |message| { listener.notify_fetch(message.to().unwrap()); diff --git a/components/script/network_listener.rs b/components/script/network_listener.rs index 13aa26c25e4..5d37b025cca 100644 --- a/components/script/network_listener.rs +++ b/components/script/network_listener.rs @@ -6,7 +6,7 @@ use net_traits::{Action, AsyncResponseListener, FetchResponseListener}; use net_traits::{FetchResponseMsg, ResponseAction}; use script_runtime::ScriptThreadEventCategory::NetworkEvent; use script_runtime::{CommonScriptMsg, ScriptChan}; -use script_thread::Runnable; +use script_thread::{Runnable, RunnableWrapper}; use std::sync::{Arc, Mutex}; /// An off-thread sink for async network event runnables. All such events are forwarded to @@ -14,15 +14,25 @@ use std::sync::{Arc, Mutex}; pub struct NetworkListener<Listener: PreInvoke + Send + 'static> { pub context: Arc<Mutex<Listener>>, pub script_chan: Box<ScriptChan + Send>, + pub wrapper: Option<RunnableWrapper>, } impl<Listener: PreInvoke + Send + 'static> NetworkListener<Listener> { pub fn notify<A: Action<Listener> + Send + 'static>(&self, action: A) { - if let Err(err) = self.script_chan.send(CommonScriptMsg::RunnableMsg(NetworkEvent, box ListenerRunnable { + let runnable = ListenerRunnable { context: self.context.clone(), action: action, - })) { - warn!("failed to deliver network data: {:?}", err); + }; + if let Some(ref wrapper) = self.wrapper { + if let Err(err) = self.script_chan.send( + CommonScriptMsg::RunnableMsg(NetworkEvent, wrapper.wrap_runnable(runnable))) { + warn!("failed to deliver network data: {:?}", err); + } + } else { + if let Err(err) = self.script_chan.send( + CommonScriptMsg::RunnableMsg(NetworkEvent, box runnable)) { + warn!("failed to deliver network data: {:?}", err); + } } } } diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 8a7fc82f52e..e116ace1be4 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -190,7 +190,7 @@ pub struct CancellableRunnable<T: Runnable + Send> { impl<T: Runnable + Send> Runnable for CancellableRunnable<T> { fn is_cancelled(&self) -> bool { - self.cancelled.load(Ordering::Relaxed) + self.cancelled.load(Ordering::SeqCst) } fn handler(self: Box<CancellableRunnable<T>>) { @@ -2055,6 +2055,7 @@ impl ScriptThread { let listener = NetworkListener { context: context, script_chan: self.chan.clone(), + wrapper: None, }; ROUTER.add_route(action_receiver.to_opaque(), box move |message| { listener.notify_action(message.to().unwrap()); |