Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 199 insertions, 0 deletions

diff --git a/toolkit/components/uniffi-fixtures/sprites/Cargo.toml b/toolkit/components/uniffi-fixtures/sprites/Cargo.toml
new file mode 100644
index 0000000000..3b4f96e143
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "uniffi-example-sprites"
+edition = "2021"
+version = "0.22.0"
+authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
+license = "MPL-2.0"
+publish = false
+
+[lib]
+crate-type = ["lib", "cdylib"]
+name = "uniffi_sprites"
+
+[dependencies]
+uniffi = { workspace = true }
+
+[build-dependencies]
+uniffi = { workspace = true, features = ["build"] }
+
+[dev-dependencies]
+uniffi = { workspace = true, features = ["bindgen-tests"] }
diff --git a/toolkit/components/uniffi-fixtures/sprites/build.rs b/toolkit/components/uniffi-fixtures/sprites/build.rs
new file mode 100644
index 0000000000..26ac3085b8
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/build.rs
@@ -0,0 +1,7 @@
+/* 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/. */
+
+fn main() {
+    uniffi::generate_scaffolding("src/sprites.udl").unwrap();
+}
diff --git a/toolkit/components/uniffi-fixtures/sprites/src/lib.rs b/toolkit/components/uniffi-fixtures/sprites/src/lib.rs
new file mode 100644
index 0000000000..d3cc11e408
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/src/lib.rs
@@ -0,0 +1,65 @@
+/* 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 std::sync::RwLock;
+
+// A point in two-dimensional space.
+#[derive(Debug, Clone)]
+pub struct Point {
+    x: f64,
+    y: f64,
+}
+
+// A magnitude and direction in two-dimensional space.
+// For simplicity we represent this as a point relative to the origin.
+#[derive(Debug, Clone)]
+pub struct Vector {
+    dx: f64,
+    dy: f64,
+}
+
+// Move from the given Point, according to the given Vector.
+pub fn translate(p: &Point, v: Vector) -> Point {
+    Point {
+        x: p.x + v.dx,
+        y: p.y + v.dy,
+    }
+}
+
+// An entity in our imaginary world, which occupies a position in space
+// and which can move about over time.
+#[derive(Debug)]
+pub struct Sprite {
+    // We must use interior mutability for managing mutable state, hence the `RwLock`.
+    current_position: RwLock<Point>,
+}
+
+impl Sprite {
+    fn new(initial_position: Option<Point>) -> Sprite {
+        Sprite {
+            current_position: RwLock::new(initial_position.unwrap_or(Point { x: 0.0, y: 0.0 })),
+        }
+    }
+
+    fn new_relative_to(reference: Point, direction: Vector) -> Sprite {
+        Sprite {
+            current_position: RwLock::new(translate(&reference, direction)),
+        }
+    }
+
+    fn get_position(&self) -> Point {
+        self.current_position.read().unwrap().clone()
+    }
+
+    fn move_to(&self, position: Point) {
+        *self.current_position.write().unwrap() = position;
+    }
+
+    fn move_by(&self, direction: Vector) {
+        let mut current_position = self.current_position.write().unwrap();
+        *current_position = translate(&current_position, direction)
+    }
+}
+
+uniffi::include_scaffolding!("sprites");
diff --git a/toolkit/components/uniffi-fixtures/sprites/src/sprites.udl b/toolkit/components/uniffi-fixtures/sprites/src/sprites.udl
new file mode 100644
index 0000000000..6781c6cee5
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/src/sprites.udl
@@ -0,0 +1,22 @@
+
+namespace sprites {
+  Point translate([ByRef] Point position, Vector direction);
+};
+
+dictionary Point {
+  double x;
+  double y;
+};
+
+dictionary Vector {
+  double dx;
+  double dy;
+};
+
+interface Sprite {
+  constructor(Point? initial_position);
+  [Name=new_relative_to] constructor(Point reference, Vector direction);
+  Point get_position();
+  void move_to(Point position);
+  void move_by(Vector direction);
+};
diff --git a/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.kts b/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.kts
new file mode 100644
index 0000000000..42451f28dd
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.kts
@@ -0,0 +1,25 @@
+import uniffi.sprites.*;
+
+val sempty = Sprite(null)
+assert( sempty.getPosition() == Point(0.0, 0.0) )
+
+val s = Sprite(Point(0.0, 1.0))
+assert( s.getPosition() == Point(0.0, 1.0) )
+
+s.moveTo(Point(1.0, 2.0))
+assert( s.getPosition() == Point(1.0, 2.0) )
+
+s.moveBy(Vector(-4.0, 2.0))
+assert( s.getPosition() == Point(-3.0, 4.0) )
+
+s.destroy()
+try {
+    s.moveBy(Vector(0.0, 0.0))
+    assert(false) { "Should not be able to call anything after `destroy`" }
+} catch(e: IllegalStateException) {
+    assert(true)
+}
+
+val srel = Sprite.newRelativeTo(Point(0.0, 1.0), Vector(1.0, 1.5))
+assert( srel.getPosition() == Point(1.0, 2.5) )
+
diff --git a/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.py b/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.py
new file mode 100644
index 0000000000..1e91997001
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.py
@@ -0,0 +1,16 @@
+from sprites import Point, Sprite, Vector
+
+sempty = Sprite(None)
+assert sempty.get_position() == Point(x=0, y=0)
+
+s = Sprite(Point(x=0, y=1))
+assert s.get_position() == Point(x=0, y=1)
+
+s.move_to(Point(x=1, y=2))
+assert s.get_position() == Point(x=1, y=2)
+
+s.move_by(Vector(dx=-4, dy=2))
+assert s.get_position() == Point(x=-3, y=4)
+
+srel = Sprite.new_relative_to(Point(x=0, y=1), Vector(dx=1, dy=1.5))
+assert srel.get_position() == Point(x=1, y=2.5)
diff --git a/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.rb b/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.rb
new file mode 100644
index 0000000000..fa73043979
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'test/unit'
+require 'sprites'
+
+include Test::Unit::Assertions
+include Sprites
+
+sempty = Sprite.new(nil)
+assert_equal sempty.get_position, Point.new(x: 0, y: 0)
+
+s = Sprite.new(Point.new(x: 0, y: 1))
+assert_equal s.get_position, Point.new(x: 0, y: 1)
+
+s.move_to(Point.new(x: 1, y: 2))
+assert_equal s.get_position, Point.new(x: 1, y: 2)
+
+s.move_by(Vector.new(dx: -4, dy: 2))
+assert_equal s.get_position, Point.new(x: -3, y: 4)
+
+srel = Sprite.new_relative_to(Point.new(x: 0, y: 1), Vector.new(dx: 1, dy: 1.5))
+assert_equal srel.get_position, Point.new(x: 1, y: 2.5)
diff --git a/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.swift b/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.swift
new file mode 100644
index 0000000000..d5428ac679
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/tests/bindings/test_sprites.swift
@@ -0,0 +1,16 @@
+import sprites
+
+let sempty = Sprite(initialPosition: nil)
+assert( sempty.getPosition() == Point(x: 0, y: 0))
+
+let s = Sprite(initialPosition: Point(x: 0, y: 1))
+assert( s.getPosition() == Point(x: 0, y: 1))
+
+s.moveTo(position: Point(x: 1.0, y: 2.0))
+assert( s.getPosition() == Point(x: 1, y: 2))
+
+s.moveBy(direction: Vector(dx: -4, dy: 2))
+assert( s.getPosition() == Point(x: -3, y: 4))
+
+let srel = Sprite.newRelativeTo(reference: Point(x: 0.0, y: 1.0), direction: Vector(dx: 1, dy: 1.5))
+assert( srel.getPosition() == Point(x: 1.0, y: 2.5) )
diff --git a/toolkit/components/uniffi-fixtures/sprites/tests/test_generated_bindings.rs b/toolkit/components/uniffi-fixtures/sprites/tests/test_generated_bindings.rs
new file mode 100644
index 0000000000..00dd779d68
--- /dev/null
+++ b/toolkit/components/uniffi-fixtures/sprites/tests/test_generated_bindings.rs
@@ -0,0 +1,6 @@
+uniffi::build_foreign_language_testcases!(
+    "tests/bindings/test_sprites.py",
+    "tests/bindings/test_sprites.rb",
+    "tests/bindings/test_sprites.kts",
+    "tests/bindings/test_sprites.swift",
+);