aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-11-12 04:31:13 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-11-12 04:31:13 +0530
commit49d48a8680003267f29ebf8cd47c244b07f4c4d2 (patch)
tree16743d6f04e786a3f0b763d7a84cb9e89d9f9b61 /components/script/script_task.rs
parent12f6ba29a74029fa8c83cc7274181d441e1e52dd (diff)
parent7623e895064843f33a0cd93080001480113cb20a (diff)
downloadservo-49d48a8680003267f29ebf8cd47c244b07f4c4d2.tar.gz
servo-49d48a8680003267f29ebf8cd47c244b07f4c4d2.zip
Auto merge of #8475 - benschulz:xhr-timeout-ordering2, r=jdm
Execute XHR timeout callbacks directly. (Fixes #8468.) This is a fix for #8468. Currently XHR timeouts schedule themselves for execution via `CommonScriptMsg::RunnableMsg`s. This was necessary when these timeouts used a separate thread to schedule themselves. Now it's a potential race that should have been eliminated as part of #8168. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8475) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 28e194b2a4a..99312a61bd6 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -236,7 +236,6 @@ pub enum ScriptTaskEventCategory {
SetViewport,
WebSocketEvent,
WorkerEvent,
- XhrEvent,
}
/// Messages used to control the script event loop
@@ -954,7 +953,6 @@ impl ScriptTask {
ScriptTaskEventCategory::TimerEvent => ProfilerCategory::ScriptTimerEvent,
ScriptTaskEventCategory::WebSocketEvent => ProfilerCategory::ScriptWebSocketEvent,
ScriptTaskEventCategory::WorkerEvent => ProfilerCategory::ScriptWorkerEvent,
- ScriptTaskEventCategory::XhrEvent => ProfilerCategory::ScriptXhrEvent,
};
profile(profiler_cat, None, self.time_profiler_chan.clone(), f)
} else {