Auto merge of #4758 - moz-gfx:github-sync, r=auto

Sync changes from mozilla-central gfx/wr

None

Author: bors-servo

wr_glyph_rasterizer/Cargo.toml

@@ -12,7 +12,7 @@ dynamic_freetype = []
 static_freetype = ["freetype/freetype-sys"]
 capture = ["api/serialize", "serde", "smallvec/serde"]
 replay = ["api/deserialize", "serde", "smallvec/serde"]
-gecko = ["fog"]
+gecko = ["fog", "glean"]
 
 [dependencies]
 api = { version = "0.62.0", path = "../webrender_api", package = "webrender_api" }
@@ -25,7 +25,7 @@ tracy-rs = "0.1.2"
 log = "0.4"
 lazy_static = "1"
 fxhash = "0.2.1"
-glean = "51.8.2"
+glean = { version = "51.8.2", optional = true }
 fog = { version = "0.1.0", optional = true }
 serde = { optional = true, version = "1.0", features = ["serde_derive"] }
 

wr_glyph_rasterizer/src/telemetry.rs

@@ -2,17 +2,21 @@
  * 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 fog::metrics::wr;
 
+#[cfg(not(feature = "gecko"))]
+pub struct TimerId;
+
 pub struct Telemetry;
 
 /// Defines the interface for hooking up an external telemetry reporter to WR.
 #[cfg(not(feature = "gecko"))]
 impl Telemetry {
     // Start rasterize glyph time collection
-    pub fn start_rasterize_glyphs_time() -> TimerId { return TimerId { id: 0 }; }
+    pub fn start_rasterize_glyphs_time() -> TimerId { return TimerId {}; }
     // End rasterize glyph time collection
     pub fn stop_and_accumulate_rasterize_glyphs_time(_id: TimerId) { }
 }