Add glue for calc values

components/style/gecko_conversions.rs

@@ -0,0 +1,36 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+//! This module contains conversion helpers between Servo and Gecko types
+//! Ideally, it would be in geckolib itself, but coherence
+//! forces us to keep the traits and implementations here
+
+use app_units::Au;
+use gecko_bindings::structs::nsStyleCoord_CalcValue;
+use values::computed::CalcLengthOrPercentage;
+
+impl From<CalcLengthOrPercentage> for nsStyleCoord_CalcValue {
+    fn from(other: CalcLengthOrPercentage) -> nsStyleCoord_CalcValue {
+        let has_percentage = other.percentage.is_some();
+        nsStyleCoord_CalcValue {
+            mLength: other.length.map(|l| l.0).unwrap_or(0),
+            mPercent: other.percentage.unwrap_or(0.0),
+            mHasPercent: has_percentage,
+        }
+    }
+}
+
+impl From<nsStyleCoord_CalcValue> for CalcLengthOrPercentage {
+    fn from(other: nsStyleCoord_CalcValue) -> CalcLengthOrPercentage {
+        let percentage = if other.mHasPercent {
+            Some(other.mPercent)
+        } else {
+            None
+        };
+        CalcLengthOrPercentage {
+            length: Some(Au(other.mLength)),
+            percentage: percentage,
+        }
+    }
+}

components/style/lib.rs

@@ -80,6 +80,8 @@ pub mod data;
 pub mod dom;
 pub mod element_state;
 pub mod error_reporting;
+#[cfg(feature = "gecko")]
+pub mod gecko_conversions;
 pub mod font_face;
 pub mod keyframes;
 pub mod logical_geometry;

ports/geckolib/gecko_bindings/sugar/mod.rs

@@ -3,4 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 mod ns_style_auto_array;
+mod ns_style_coord;
 mod ns_t_array;

ports/geckolib/gecko_bindings/sugar/ns_style_coord.rs

@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+use structs::{nsStyleCoord_CalcValue, nsStyleCoord_Calc, nsStyleUnit, nsStyleUnion};
+use bindings::{Gecko_ResetStyleCoord, Gecko_SetStyleCoordCalcValue};
+
+// Functions here are unsafe because it is possible to use the wrong nsStyleUnit
+// FIXME we should be pairing up nsStyleUnion and nsStyleUnit somehow
+// nsStyleCoord is one way to do it, but there are other structs using pairs
+// of union and unit too
+
+impl nsStyleUnion {
+    /// Clean up any resources used by an nsStyleUnit
+    /// Currently, this only happens if the nsStyleUnit
+    /// is a Calc
+    pub unsafe fn reset(&mut self, unit: &mut nsStyleUnit) {
+        if *unit == nsStyleUnit::eStyleUnit_Calc {
+            Gecko_ResetStyleCoord(unit, self);
+        }
+    }
+
+    /// Set internal value to a calc() value
+    /// reset() the union before calling this
+    pub unsafe fn set_calc_value(&mut self, unit: &mut nsStyleUnit, v: nsStyleCoord_CalcValue) {
+        // Calc should have been cleaned up
+        assert!(*unit != nsStyleUnit::eStyleUnit_Calc);
+        Gecko_SetStyleCoordCalcValue(unit, self, v);
+    }
+
+    pub unsafe fn get_calc(&self) -> nsStyleCoord_CalcValue {
+        (*(*self.mPointer.as_ref() as *const nsStyleCoord_Calc))._base
+    }
+}