Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unsound Root::deref() calls in XMLHttpRequest.

Browse source
This commit is contained in:
Ms2ger 2015-01-01 16:51:17 +01:00
parent a094c0a7f3
commit 925058ef26
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/xmlhttprequest.rs
View file

@ -510,8 +510,8 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
if !self.sync.get() { if !self.sync.get() {
// Step 8 // Step 8
let upload_target = *self.upload.root(); let upload_target = self.upload.root();
let event_target: JSRef<EventTarget> = EventTargetCast::from_ref(upload_target); let event_target: JSRef<EventTarget> = EventTargetCast::from_ref(upload_target.r());
if event_target.has_handlers() { if event_target.has_handlers() {
self.upload_events.set(true); self.upload_events.set(true);
} }
@ -898,13 +898,13 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
fn dispatch_progress_event(self, upload: bool, type_: DOMString, loaded: u64, total: Option<u64>) { fn dispatch_progress_event(self, upload: bool, type_: DOMString, loaded: u64, total: Option<u64>) {
let global = self.global.root(); let global = self.global.root();
let upload_target = *self.upload.root(); let upload_target = self.upload.root();
let progressevent = ProgressEvent::new(global.root_ref(), let progressevent = ProgressEvent::new(global.root_ref(),
type_, false, false, type_, false, false,
total.is_some(), loaded, total.is_some(), loaded,
total.unwrap_or(0)).root(); total.unwrap_or(0)).root();
let target: JSRef<EventTarget> = if upload { let target: JSRef<EventTarget> = if upload {
EventTargetCast::from_ref(upload_target) EventTargetCast::from_ref(upload_target.r())
} else { } else {
EventTargetCast::from_ref(self) EventTargetCast::from_ref(self)
}; };