Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/gfx/wr/webrender/src/telemetry.rs b/gfx/wr/webrender/src/telemetry.rs
index 9b4c02d68e..5fd67bb80c 100644
--- a/gfx/wr/webrender/src/telemetry.rs
+++ b/gfx/wr/webrender/src/telemetry.rs
@@ -2,6 +2,7 @@
  * 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/. */
 
+#[cfg(feature = "gecko")]
 use glean::TimerId;
 #[cfg(feature = "gecko")]
 use firefox_on_glean::metrics::wr;
@@ -9,16 +10,19 @@ use std::time::Duration;
 
 pub struct Telemetry;
 
+#[cfg(not(feature = "gecko"))]
+pub struct TimerId;
+
 /// Defines the interface for hooking up an external telemetry reporter to WR.
 #[cfg(not(feature = "gecko"))]
 impl Telemetry {
     pub fn record_rasterize_blobs_time(_duration: Duration) { }
-    pub fn start_framebuild_time() -> TimerId { TimerId { id: 0 } }
+    pub fn start_framebuild_time() -> TimerId { TimerId }
     pub fn stop_and_accumulate_framebuild_time(_id: TimerId) { }
     pub fn record_renderer_time(_duration: Duration) { }
     pub fn record_renderer_time_no_sc(_duration: Duration) { }
     pub fn record_scenebuild_time(_duration: Duration) { }
-    pub fn start_sceneswap_time() -> TimerId { TimerId { id: 0 } }
+    pub fn start_sceneswap_time() -> TimerId { TimerId }
     pub fn stop_and_accumulate_sceneswap_time(_id: TimerId) { }
     pub fn cancel_sceneswap_time(_id: TimerId) { }
     pub fn record_texture_cache_update_time(_duration: Duration) { }