Handle RawGeckoElement and friends, add support for types which are used in both maybe-null and non-null forms

Author: Manishearth

components/style/properties/gecko.mako.rs

@@ -24,7 +24,7 @@ use gecko_bindings::bindings::{Gecko_EnsureImageLayersLength, Gecko_CreateGradie
 use gecko_bindings::bindings::{Gecko_CopyImageValueFrom, Gecko_CopyFontFamilyFrom};
 use gecko_bindings::bindings::{Gecko_FontFamilyList_AppendGeneric, Gecko_FontFamilyList_AppendNamed};
 use gecko_bindings::bindings::{Gecko_FontFamilyList_Clear, Gecko_InitializeImageLayer};
-use gecko_bindings::bindings::ServoComputedValuesBorrowed;
+use gecko_bindings::bindings::ServoComputedValuesMaybeBorrowed;
 use gecko_bindings::structs;
 use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordData, CoordDataMut};
 use gecko_values::{StyleCoordHelpers, GeckoStyleCoordConvertible, convert_nscolor_to_rgba};
@@ -1712,8 +1712,8 @@ fn static_assert() {
 <%def name="define_ffi_struct_accessor(style_struct)">
 #[no_mangle]
 #[allow(non_snake_case, unused_variables)]
-pub extern "C" fn Servo_GetStyle${style_struct.gecko_name}(computed_values: ServoComputedValuesBorrowed)
-  -> *const ${style_struct.gecko_ffi_name} {
+pub extern "C" fn Servo_GetStyle${style_struct.gecko_name}(computed_values:
+        ServoComputedValuesMaybeBorrowed) -> *const ${style_struct.gecko_ffi_name} {
     computed_values.as_arc::<ComputedValues>().get_${style_struct.name_lower}().get_gecko()
         as *const ${style_struct.gecko_ffi_name}
 }

ports/geckolib/binding_tools/regen.py

@@ -156,11 +156,15 @@
         ],
         "servo_owned_types": [
             "RawServoStyleSet",
-            "RawGeckoNode",
         ],
         "servo_maybe_owned_types": [
             "ServoNodeData",
         ],
+        "servo_immutable_borrow_types": [
+            "RawGeckoNode",
+            "RawGeckoElement",
+            "RawGeckoDocument",
+        ],
     },
 
     "atoms": {
@@ -329,9 +333,19 @@ def build(objdir, target_name, debug, debugger, kind_name=None,
             flags.append("--raw-line")
             flags.append("pub type {0}Strong = ::sugar::ownership::Strong<{0}>;".format(ty))
             flags.append("--blacklist-type")
+            flags.append("{}MaybeBorrowed".format(ty))
+            flags.append("-raw-line")
+            flags.append("pub type {0}MaybeBorrowed<'a> = ::sugar::ownership::Borrowed<'a, {0}>;".format(ty))
+    if "servo_immutable_borrow_types" in current_target:
+        for ty in current_target["servo_immutable_borrow_types"]:
+            flags.append("-blacklist-type")
             flags.append("{}Borrowed".format(ty))
             flags.append("--raw-line")
-            flags.append("pub type {0}Borrowed<'a> = ::sugar::ownership::Borrowed<'a, {0}>;".format(ty))
+            flags.append("pub type {0}Borrowed<'a> = &'a {0};".format(ty))
+            flags.append("--blacklist-type")
+            flags.append("{}MaybeBorrowed".format(ty))
+            flags.append("--raw-line")
+            flags.append("pub type {0}MaybeBorrowed<'a> = ::sugar::ownership::Borrowed<'a, {0}>;".format(ty))
     if "servo_owned_types" in current_target:
         for ty in current_target["servo_owned_types"]:
             flags.append("--blacklist-type")
@@ -349,19 +363,19 @@ def build(objdir, target_name, debug, debugger, kind_name=None,
     if "servo_maybe_owned_types" in current_target:
         for ty in current_target["servo_maybe_owned_types"]:
             flags.append("--blacklist-type")
-            flags.append("{}Borrowed".format(ty))
+            flags.append("{}MaybeBorrowed".format(ty))
             flags.append("--raw-line")
-            flags.append("pub type {0}Borrowed<'a> = ::sugar::ownership::Borrowed<'a, {0}>;"
+            flags.append("pub type {0}MaybeBorrowed<'a> = ::sugar::ownership::Borrowed<'a, {0}>;"
                          .format(ty))
             flags.append("--blacklist-type")
-            flags.append("{}BorrowedMut".format(ty))
+            flags.append("{}MaybeBorrowedMut".format(ty))
             flags.append("--raw-line")
-            flags.append("pub type {0}BorrowedMut<'a> = ::sugar::ownership::BorrowedMut<'a, {0}>;"
+            flags.append("pub type {0}MaybeBorrowedMut<'a> = ::sugar::ownership::BorrowedMut<'a, {0}>;"
                          .format(ty))
             flags.append("--blacklist-type")
-            flags.append("{}Owned".format(ty))
+            flags.append("{}MaybeOwned".format(ty))
             flags.append("--raw-line")
-            flags.append("pub type {0}Owned = ::sugar::ownership::MaybeOwned<{0}>;".format(ty))
+            flags.append("pub type {0}MaybeOwned = ::sugar::ownership::MaybeOwned<{0}>;".format(ty))
     if "structs_types" in current_target:
         for ty in current_target["structs_types"]:
             ty_fragments = ty.split("::")