diff options
author | bors-servo <metajack+bors@gmail.com> | 2014-11-05 20:03:34 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2014-11-05 20:03:34 -0700 |
commit | 57cb8a10f0f6ed445ed7ba88a3fa19d56bd7015e (patch) | |
tree | dbb31497e6dc9ee03d88f445805f0cad30e1c217 /components/script/dom | |
parent | 45262ec9d212088f2bafa95981099d25eaac77bb (diff) | |
parent | 52983ed97cb76691c09efe807b449f70a0cc0a7b (diff) | |
download | servo-57cb8a10f0f6ed445ed7ba88a3fa19d56bd7015e.tar.gz servo-57cb8a10f0f6ed445ed7ba88a3fa19d56bd7015e.zip |
auto merge of #3903 : Manishearth/servo/plugin-fixes, r=jdm
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 3ad488253b0..869820e0ca6 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -13,7 +13,7 @@ use dom::bindings::codegen::InheritTypes::{EventCast, EventTargetCast, XMLHttpRe use dom::bindings::conversions::ToJSValConvertible; use dom::bindings::error::{Error, ErrorResult, Fallible, InvalidState, InvalidAccess}; use dom::bindings::error::{Network, Syntax, Security, Abort, Timeout}; -use dom::bindings::global::{GlobalField, GlobalRef, WorkerField}; +use dom::bindings::global::{GlobalField, GlobalRef, WorkerRoot}; use dom::bindings::js::{MutNullableJS, JS, JSRef, Temporary, OptionalRootedRootable}; use dom::bindings::str::ByteString; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; @@ -698,8 +698,8 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> { self.response_type.get() } fn SetResponseType(self, response_type: XMLHttpRequestResponseType) -> ErrorResult { - match self.global { - WorkerField(_) if response_type == XMLHttpRequestResponseTypeValues::Document + match self.global.root() { + WorkerRoot(_) if response_type == XMLHttpRequestResponseTypeValues::Document => return Ok(()), _ => {} } |