aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/xmlhttprequest.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-12-07 07:46:10 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-12-07 07:46:10 +0530
commitef000a458a52051b55b65e254ff9fe1a55835d04 (patch)
tree047be5e948a1fba000d5d652f84217005164e4d5 /components/script/dom/xmlhttprequest.rs
parent95e6b1d101ca1a1019b8fea1a13a5ef37430901f (diff)
parent8d90034d2917cc68a4d7e570b010fa60e8514b95 (diff)
downloadservo-ef000a458a52051b55b65e254ff9fe1a55835d04.tar.gz
servo-ef000a458a52051b55b65e254ff9fe1a55835d04.zip
Auto merge of #8853 - KiChjang:generic-task-sources, r=jdm
Split fn script_chan into 5 different task channel fn Partial #7959. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8853) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
-rw-r--r--components/script/dom/xmlhttprequest.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 0f93410f0c1..47f4c12f903 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -984,7 +984,7 @@ impl XMLHttpRequest {
// This will cancel all previous timeouts
let global = self.global.root();
let callback = ScheduledXHRTimeout {
- xhr: Trusted::new(global.r().get_cx(), self, global.r().script_chan()),
+ xhr: Trusted::new(global.r().get_cx(), self, global.r().networking_task_source()),
generation_id: self.generation_id.get(),
};
let duration = Length::new(duration_ms as u64);
@@ -1056,7 +1056,7 @@ impl XMLHttpRequest {
Ok(req) => req,
};
- let xhr = Trusted::new(global.get_cx(), self, global.script_chan());
+ let xhr = Trusted::new(global.get_cx(), self, global.networking_task_source());
let context = Arc::new(Mutex::new(XHRContext {
xhr: xhr,
@@ -1070,7 +1070,7 @@ impl XMLHttpRequest {
let (tx, rx) = global.new_script_pair();
(tx, Some(rx))
} else {
- (global.script_chan(), None)
+ (global.networking_task_source(), None)
};
let resource_task = global.resource_task();