Merge remote-tracking branch 'upstream/master' into feat-cow-infra

`tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html`
was reverted to the upstream version.

1 files changed, 0 insertions, 63 deletions

diff --git a/components/script/dom/vrdisplaycapabilities.rs b/components/script/dom/vrdisplaycapabilities.rs
deleted file mode 100644
index 349fd272140..00000000000
--- a/components/script/dom/vrdisplaycapabilities.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use dom::bindings::cell::DOMRefCell;
-use dom::bindings::codegen::Bindings::VRDisplayCapabilitiesBinding;
-use dom::bindings::codegen::Bindings::VRDisplayCapabilitiesBinding::VRDisplayCapabilitiesMethods;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::{Reflector, reflect_dom_object};
-use dom::globalscope::GlobalScope;
-use dom_struct::dom_struct;
-use webvr_traits::WebVRDisplayCapabilities;
-
-#[dom_struct]
-pub struct VRDisplayCapabilities {
-    reflector_: Reflector,
-    #[ignore_heap_size_of = "Defined in rust-webvr"]
-    capabilities: DOMRefCell<WebVRDisplayCapabilities>
-}
-
-unsafe_no_jsmanaged_fields!(WebVRDisplayCapabilities);
-
-impl VRDisplayCapabilities {
-    fn new_inherited(capabilities: WebVRDisplayCapabilities) -> VRDisplayCapabilities {
-        VRDisplayCapabilities {
-            reflector_: Reflector::new(),
-            capabilities: DOMRefCell::new(capabilities)
-        }
-    }
-
-    pub fn new(capabilities: WebVRDisplayCapabilities, global: &GlobalScope) -> Root<VRDisplayCapabilities> {
-        reflect_dom_object(box VRDisplayCapabilities::new_inherited(capabilities),
-                           global,
-                           VRDisplayCapabilitiesBinding::Wrap)
-    }
-}
-
-impl VRDisplayCapabilitiesMethods for VRDisplayCapabilities {
-    // https://w3c.github.io/webvr/#dom-vrdisplaycapabilities-hasposition
-    fn HasPosition(&self) -> bool {
-        self.capabilities.borrow().has_position
-    }
-
-    // https://w3c.github.io/webvr/#dom-vrdisplaycapabilities-hasorientation
-    fn HasOrientation(&self) -> bool {
-        self.capabilities.borrow().has_orientation
-    }
-
-    // https://w3c.github.io/webvr/#dom-vrdisplaycapabilities-hasexternaldisplay
-    fn HasExternalDisplay(&self) -> bool {
-        self.capabilities.borrow().has_external_display
-    }
-
-    // https://w3c.github.io/webvr/#dom-vrdisplaycapabilities-canpresent
-    fn CanPresent(&self) -> bool {
-        self.capabilities.borrow().can_present
-    }
-
-    // https://w3c.github.io/webvr/#dom-vrdisplaycapabilities-maxlayers
-    fn MaxLayers(&self) -> u32 {
-        if self.CanPresent() { 1 } else { 0 }
-    }
-}