1 files changed, 32 insertions, 6 deletions
diff --git a/components/layout_2020/layout_debug.rs b/components/layout_2020/layout_debug.rs
index 79762f8b757..21636f32a89 100644
--- a/components/layout_2020/layout_debug.rs
+++ b/components/layout_2020/layout_debug.rs
@@ -6,6 +6,8 @@
 //! that can be viewed by an external tool to make layout debugging easier.
 
 use crate::flow::{BoxTree, FragmentTree};
+#[cfg(not(debug_assertions))]
+use serde::ser::{Serialize, Serializer};
 use serde_json::{to_string, to_value, Value};
 use std::cell::RefCell;
 use std::fs;
@@ -101,12 +103,6 @@ impl Drop for Scope {
     }
 }
 
-/// Generate a unique ID for Fragments.
-#[cfg(debug_assertions)]
-pub fn generate_unique_debug_id() -> u16 {
-    DEBUG_ID_COUNTER.fetch_add(1, Ordering::SeqCst) as u16
-}
-
 /// Begin a layout debug trace. If this has not been called,
 /// creating debug scopes has no effect.
 pub fn begin_trace(box_tree: Arc<BoxTree>, fragment_tree: Arc<FragmentTree>) {
@@ -146,3 +142,33 @@ pub fn end_trace(generation: u32) {
     )
     .unwrap();
 }
+
+#[cfg(not(debug_assertions))]
+#[derive(Clone, Debug)]
+pub struct DebugId;
+
+#[cfg(debug_assertions)]
+#[derive(Clone, Debug, Serialize)]
+#[serde(transparent)]
+pub struct DebugId(u16);
+
+#[cfg(not(debug_assertions))]
+impl DebugId {
+    pub fn new() -> DebugId {
+        DebugId
+    }
+}
+
+#[cfg(debug_assertions)]
+impl DebugId {
+    pub fn new() -> DebugId {
+        DebugId(DEBUG_ID_COUNTER.fetch_add(1, Ordering::SeqCst) as u16)
+    }
+}
+
+#[cfg(not(debug_assertions))]
+impl Serialize for DebugId {
+    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_str(&format!("{:p}", &self))
+    }
+}