From dd5e28e0e6669e7960cf0c32387697529a7e4e45 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 13 Apr 2016 13:56:01 -0400 Subject: [PATCH] Do not support XHR.responseXML in worker globals. Fixes #8931. --- components/script/dom/xmlhttprequest.rs | 6 ++++++ tests/wpt/metadata/workers/semantics/xhr/001.html.ini | 3 --- tests/wpt/metadata/workers/semantics/xhr/002.html.ini | 6 ------ 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 tests/wpt/metadata/workers/semantics/xhr/001.html.ini delete mode 100644 tests/wpt/metadata/workers/semantics/xhr/002.html.ini diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 1d7c2bffd34..8d6716201af 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -828,6 +828,12 @@ impl XMLHttpRequestMethods for XMLHttpRequest { // https://xhr.spec.whatwg.org/#the-responsexml-attribute fn GetResponseXML(&self) -> Fallible>> { + // TODO(#2823): Until [Exposed] is implemented, this attribute needs to return null + // explicitly in the worker scope. + if let GlobalRoot::Worker(_) = self.global() { + return Ok(None); + } + match self.response_type.get() { XMLHttpRequestResponseType::_empty | XMLHttpRequestResponseType::Document => { // Step 3 diff --git a/tests/wpt/metadata/workers/semantics/xhr/001.html.ini b/tests/wpt/metadata/workers/semantics/xhr/001.html.ini deleted file mode 100644 index 67f5d9b0879..00000000000 --- a/tests/wpt/metadata/workers/semantics/xhr/001.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[001.html] - type: testharness - expected: CRASH diff --git a/tests/wpt/metadata/workers/semantics/xhr/002.html.ini b/tests/wpt/metadata/workers/semantics/xhr/002.html.ini deleted file mode 100644 index 33350a42d01..00000000000 --- a/tests/wpt/metadata/workers/semantics/xhr/002.html.ini +++ /dev/null @@ -1,6 +0,0 @@ -[002.html] - type: testharness - expected: TIMEOUT - [sync XMLHttpRequest in dedicated worker] - expected: TIMEOUT -