Make step 3 of XHR's SetResponseType method match the specification

servo · Feb 6, 2016 · 816c65a · 816c65a
1 parent 289232e
commit 816c65a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
@@ -675,16 +675,18 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
     // https://xhr.spec.whatwg.org/#the-responsetype-attribute
     fn SetResponseType(&self, response_type: XMLHttpRequestResponseType) -> ErrorResult {
         match self.global() {
-            GlobalRoot::Worker(_) if response_type == XMLHttpRequestResponseType::Document
-            => return Ok(()),
+            GlobalRoot::Worker(_) if response_type == XMLHttpRequestResponseType::Document => return Ok(()),
             _ => {}
         }
         match self.ready_state.get() {
             XMLHttpRequestState::Loading | XMLHttpRequestState::Done => Err(Error::InvalidState),
-            _ if self.sync.get() => Err(Error::InvalidAccess),
             _ => {
-                self.response_type.set(response_type);
-                Ok(())
+                if let (GlobalRoot::Window(_), true) = (self.global(), self.sync.get()) {
+                    Err(Error::InvalidAccess)
+                } else {
+                    self.response_type.set(response_type);
+                    Ok(())
+                }
             }
         }
     }