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, 50 insertions, 0 deletions

diff --git a/components/script/dom/performancepainttiming.rs b/components/script/dom/performancepainttiming.rs
new file mode 100644
index 00000000000..2dd3c27f1f1
--- /dev/null
+++ b/components/script/dom/performancepainttiming.rs
@@ -0,0 +1,50 @@
+/* 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 https://mozilla.org/MPL/2.0/. */
+
+use crate::dom::bindings::reflector::reflect_dom_object;
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::DOMString;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::performanceentry::PerformanceEntry;
+use dom_struct::dom_struct;
+use metrics::ToMs;
+use script_traits::ProgressiveWebMetricType;
+
+#[dom_struct]
+pub struct PerformancePaintTiming {
+    entry: PerformanceEntry,
+}
+
+impl PerformancePaintTiming {
+    fn new_inherited(
+        metric_type: ProgressiveWebMetricType,
+        start_time: u64,
+    ) -> PerformancePaintTiming {
+        let name = match metric_type {
+            ProgressiveWebMetricType::FirstPaint => DOMString::from("first-paint"),
+            ProgressiveWebMetricType::FirstContentfulPaint => {
+                DOMString::from("first-contentful-paint")
+            },
+            _ => DOMString::from(""),
+        };
+        PerformancePaintTiming {
+            entry: PerformanceEntry::new_inherited(
+                name,
+                DOMString::from("paint"),
+                start_time.to_ms(),
+                0.,
+            ),
+        }
+    }
+
+    #[allow(unrooted_must_root)]
+    pub fn new(
+        global: &GlobalScope,
+        metric_type: ProgressiveWebMetricType,
+        start_time: u64,
+    ) -> DomRoot<PerformancePaintTiming> {
+        let entry = PerformancePaintTiming::new_inherited(metric_type, start_time);
+        reflect_dom_object(Box::new(entry), global)
+    }
+}