Use less-invasive stylo change for u64 opaque element

Signed-off-by: Nico Burns <[email protected]>

Cargo.toml

@@ -20,11 +20,11 @@ license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
 # Servo dependencies
-style = { git = "https://github.com/nicoburns/stylo", rev = "61c02a463", package = "style" } # u64-opaque-element
-style_config = { git = "https://github.com/nicoburns/stylo", rev = "61c02a463", package = "style_config" } # u64-opaque-element
-style_traits = { git = "https://github.com/nicoburns/stylo", rev = "61c02a463", package = "style_traits" } # u64-opaque-element
-style_dom = { git = "https://github.com/nicoburns/stylo", rev = "61c02a463", package = "dom" } # u64-opaque-element
-selectors = { git = "https://github.com/nicoburns/stylo", rev = "61c02a463", package = "selectors" } # u64-opaque-element
+style = { git = "https://github.com/nicoburns/stylo", rev = "3c123bb834b2b3", package = "style" } # u64-opaque-element
+style_config = { git = "https://github.com/nicoburns/stylo", rev = "3c123bb834b2b3", package = "style_config" } # u64-opaque-element
+style_traits = { git = "https://github.com/nicoburns/stylo", rev = "3c123bb834b2b3", package = "style_traits" } # u64-opaque-element
+style_dom = { git = "https://github.com/nicoburns/stylo", rev = "3c123bb834b2b3", package = "dom" } # u64-opaque-element
+selectors = { git = "https://github.com/nicoburns/stylo", rev = "3c123bb834b2b3", package = "selectors" } # u64-opaque-element
 markup5ever = "0.14" # needs to match stylo markup5ever version
 html5ever = "0.29" # needs to match stylo markup5ever version
 xml5ever = "0.20" # needs to match stylo markup5ever version

packages/blitz-dom/src/stylo.rs

@@ -1,6 +1,7 @@
 //! Enable the dom to participate in styling by servo
 //!
 
+use std::ptr::NonNull;
 use std::sync::atomic::Ordering;
 
 use crate::node::BackgroundImageData;
@@ -351,7 +352,8 @@ impl selectors::Element for BlitzNode<'_> {
     fn opaque(&self) -> selectors::OpaqueElement {
         // FIXME: this is wrong in the case where pushing new elements casuses reallocations.
         // We should see if selectors will accept a PR that allows creation from a usize
-        OpaqueElement::new(self.id as u64)
+        let non_null = NonNull::new((self.id + 1) as *mut ()).unwrap();
+        OpaqueElement::from_non_null_ptr(non_null)
     }
 
     fn parent_element(&self) -> Option<Self> {