aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorConnor Brewster <connor.brewster@eagles.oc.edu>2016-07-08 09:00:43 -0600
committerConnor Brewster <connor.brewster@eagles.oc.edu>2016-07-08 09:02:16 -0600
commit55267560ca20b8e1ae1bb9173050611779673061 (patch)
treeced3a07b6ab93b83258879741024e406c6dd67a5 /components/script
parent3f285fd4376da79ae1bff8e03bda7520de989e61 (diff)
downloadservo-55267560ca20b8e1ae1bb9173050611779673061.tar.gz
servo-55267560ca20b8e1ae1bb9173050611779673061.zip
Change ignore async events ordering to SeqCst
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/window.rs2
-rw-r--r--components/script/script_thread.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 34ac683e233..ad90cc73b31 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -948,7 +948,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/script_thread.rs b/components/script/script_thread.rs
index e115d086956..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>>) {