Convert compute code to work with mutable measurables

Author: nicoburns

src/compute/leaf.rs

@@ -14,7 +14,7 @@ use crate::util::debug::NODE_LOGGER;
 /// Perform full layout on a leaf node
 pub(crate) fn perform_layout<Context>(
     style: &Style,
-    measurable: Option<&impl Measurable<Context = Context>>,
+    measurable: Option<&mut impl Measurable<Context = Context>>,
     known_dimensions: Size<Option<f32>>,
     parent_size: Size<Option<f32>>,
     available_space: Size<AvailableSpace>,
@@ -27,7 +27,7 @@ pub(crate) fn perform_layout<Context>(
 /// Measure a leaf node's size
 pub(crate) fn measure_size<Context>(
     style: &Style,
-    measurable: Option<&impl Measurable<Context = Context>>,
+    measurable: Option<&mut impl Measurable<Context = Context>>,
     known_dimensions: Size<Option<f32>>,
     parent_size: Size<Option<f32>>,
     available_space: Size<AvailableSpace>,
@@ -40,7 +40,7 @@ pub(crate) fn measure_size<Context>(
 /// Compute the size of a leaf node (node with no children)
 pub fn compute<Context>(
     style: &Style,
-    measurable: Option<&impl Measurable<Context = Context>>,
+    measurable: Option<&mut impl Measurable<Context = Context>>,
     known_dimensions: Size<Option<f32>>,
     parent_size: Size<Option<f32>>,
     available_space: Size<AvailableSpace>,

src/compute/taffy_tree.rs

@@ -225,7 +225,7 @@ fn compute_node_layout<Measure: Measurable>(
         (_, false) => match run_mode {
             RunMode::PerformLayout => leaf::perform_layout(
                 &tree.nodes[node_key].style,
-                tree.nodes[node_key].needs_measure.then(|| &tree.measure_funcs[node_key]),
+                tree.nodes[node_key].needs_measure.then(|| &mut tree.measure_funcs[node_key]),
                 known_dimensions,
                 parent_size,
                 available_space,
@@ -234,7 +234,7 @@ fn compute_node_layout<Measure: Measurable>(
             ),
             RunMode::ComputeSize => leaf::measure_size(
                 &tree.nodes[node_key].style,
-                tree.nodes[node_key].needs_measure.then(|| &tree.measure_funcs[node_key]),
+                tree.nodes[node_key].needs_measure.then(|| &mut tree.measure_funcs[node_key]),
                 known_dimensions,
                 parent_size,
                 available_space,