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, 36 insertions, 5 deletions

diff --git a/components/script/dom/navigatorinfo.rs b/components/script/dom/navigatorinfo.rs
index f0b331c49e6..e674834f14b 100644
--- a/components/script/dom/navigatorinfo.rs
+++ b/components/script/dom/navigatorinfo.rs
@@ -1,49 +1,80 @@
 /* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::str::DOMString;
-use servo_config::opts;
+use crate::dom::bindings::str::DOMString;
+use std::borrow::Cow;
 
+#[allow(non_snake_case)]
 pub fn Product() -> DOMString {
     DOMString::from("Gecko")
 }
 
+#[allow(non_snake_case)]
+pub fn ProductSub() -> DOMString {
+    DOMString::from("20100101")
+}
+
+#[allow(non_snake_case)]
+pub fn Vendor() -> DOMString {
+    DOMString::from("")
+}
+
+#[allow(non_snake_case)]
+pub fn VendorSub() -> DOMString {
+    DOMString::from("")
+}
+
+#[allow(non_snake_case)]
 pub fn TaintEnabled() -> bool {
     false
 }
 
+#[allow(non_snake_case)]
 pub fn AppName() -> DOMString {
     DOMString::from("Netscape") // Like Gecko/Webkit
 }
 
+#[allow(non_snake_case)]
 pub fn AppCodeName() -> DOMString {
     DOMString::from("Mozilla")
 }
 
+#[allow(non_snake_case)]
 #[cfg(target_os = "windows")]
 pub fn Platform() -> DOMString {
     DOMString::from("Win32")
 }
 
+#[allow(non_snake_case)]
 #[cfg(any(target_os = "android", target_os = "linux"))]
 pub fn Platform() -> DOMString {
     DOMString::from("Linux")
 }
 
+#[allow(non_snake_case)]
 #[cfg(target_os = "macos")]
 pub fn Platform() -> DOMString {
     DOMString::from("Mac")
 }
 
-pub fn UserAgent() -> DOMString {
-    DOMString::from(&*opts::get().user_agent)
+#[allow(non_snake_case)]
+#[cfg(target_os = "ios")]
+pub fn Platform() -> DOMString {
+    DOMString::from("iOS")
+}
+
+#[allow(non_snake_case)]
+pub fn UserAgent(user_agent: Cow<'static, str>) -> DOMString {
+    DOMString::from(&*user_agent)
 }
 
+#[allow(non_snake_case)]
 pub fn AppVersion() -> DOMString {
     DOMString::from("4.0")
 }
 
+#[allow(non_snake_case)]
 pub fn Language() -> DOMString {
     DOMString::from("en-US")
 }