8 files changed, 131 insertions, 21 deletions
diff --git a/gfx/tests/crashtests/crashtests.list b/gfx/tests/crashtests/crashtests.list
index 44a2f61050..fc00a7dd17 100644
--- a/gfx/tests/crashtests/crashtests.list
+++ b/gfx/tests/crashtests/crashtests.list
@@ -165,7 +165,7 @@ load 1467847-1.html
 load 1468020.html
 load 1470437.html
 load 1470440.html
-pref(widget.windows.window_occlusion_tracking.enabled,false) load 1478035.html # Bug 1819154
+load 1478035.html
 load 1490704-1.html
 load 1501518.html
 load 1503986-1.html
@@ -177,7 +177,7 @@ load 1513133.html
 load 1496194.html
 load 1505934-1.html
 load 1509123.html
-pref(widget.windows.window_occlusion_tracking.enabled,false) load 1494062-blob-image-wraplist-clip.html # Bug 1819154
+load 1494062-blob-image-wraplist-clip.html
 load texture-allocator-zero-region.html
 load 1524418.html
 pref(layout.css.individual-transform.enabled,true) load 1529149.html
diff --git a/gfx/tests/gtest/TestMoz2D.cpp b/gfx/tests/gtest/TestMoz2D.cpp
index 50854cdc98..2859f94b20 100644
--- a/gfx/tests/gtest/TestMoz2D.cpp
+++ b/gfx/tests/gtest/TestMoz2D.cpp
@@ -6,7 +6,6 @@
 
 #include "gtest/gtest.h"
 #include "TestBase.h"
-#include "TestPoint.h"
 #include "TestScaling.h"
 #include "TestBugs.h"
 
@@ -20,16 +19,6 @@ TEST(Moz2D, Bugs)
   ASSERT_EQ(failures, 0);
 }
 
-TEST(Moz2D, Point)
-{
-  TestBase* test = new TestPoint();
-  int failures = 0;
-  test->RunTests(&failures);
-  delete test;
-
-  ASSERT_EQ(failures, 0);
-}
-
 TEST(Moz2D, Scaling)
 {
   TestBase* test = new TestScaling();
diff --git a/gfx/tests/gtest/TestPoint.cpp b/gfx/tests/gtest/TestPoint.cpp
new file mode 100644
index 0000000000..9a77c8908d
--- /dev/null
+++ b/gfx/tests/gtest/TestPoint.cpp
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#include "gtest/gtest.h"
+#include <cmath>
+
+#include "BasePoint.h"
+#include "Units.h"
+#include "Point.h"
+
+using mozilla::CSSCoord;
+using mozilla::CSSIntCoord;
+using mozilla::CSSIntPoint;
+using mozilla::CSSPixel;
+using mozilla::gfx::CoordTyped;
+using mozilla::gfx::FloatType_t;
+using mozilla::gfx::IntCoordTyped;
+using mozilla::gfx::IntPointTyped;
+using mozilla::gfx::PointTyped;
+using mozilla::gfx::UnknownUnits;
+
+TEST(Gfx, TestCSSIntPointLength)
+{
+  CSSIntPoint testPnt(1, 1);
+  float res = testPnt.Length();
+
+  float epsilon = 0.001f;
+  constexpr float sqrtOfTwo = 1.414;
+  float diff = std::abs(res - sqrtOfTwo);
+  EXPECT_LT(diff, epsilon);
+}
+
+TEST(Gfx, TestPointAddition)
+{
+  PointTyped<CSSPixel> a, b;
+  a.x = 2;
+  a.y = 2;
+  b.x = 5;
+  b.y = -5;
+
+  a += b;
+
+  EXPECT_EQ(a.x, 7.f);
+  EXPECT_EQ(a.y, -3.f);
+}
+
+TEST(Gfx, TestPointSubtraction)
+{
+  PointTyped<CSSPixel> a, b;
+  a.x = 2;
+  a.y = 2;
+  b.x = 5;
+  b.y = -5;
+
+  a -= b;
+
+  EXPECT_EQ(a.x, -3.f);
+  EXPECT_EQ(a.y, 7.f);
+}
+
+TEST(Gfx, TestPointRoundToMultiple)
+{
+  const int32_t roundTo = 2;
+
+  IntPointTyped<CSSPixel> p(478, -394);
+  EXPECT_EQ(p.RoundedToMultiple(roundTo), p);
+
+  IntPointTyped<CSSPixel> p2(478, 393);
+  EXPECT_NE(p2.RoundedToMultiple(roundTo), p2);
+}
+
+TEST(Gfx, TestFloatTypeMeta)
+{
+  // TODO: Should int64_t's FloatType be double instead?
+  static_assert(std::is_same_v<FloatType_t<int64_t>, float>,
+                "The FloatType of an integer type should be float");
+  static_assert(std::is_same_v<FloatType_t<int32_t>, float>,
+                "The FloatType of an integer type should be float");
+  static_assert(
+      std::is_same_v<FloatType_t<float>, float>,
+      "The FloatType of a floating-point type should be the given type");
+  static_assert(
+      std::is_same_v<FloatType_t<double>, double>,
+      "The FloatType of a floating-point type should be the given type");
+  static_assert(
+      std::is_same_v<FloatType_t<IntCoordTyped<UnknownUnits, int32_t>>,
+                     CoordTyped<UnknownUnits, float>>,
+      "The FloatType of an IntCoordTyped<Units, Rep> should be "
+      "CoordTyped<Units, float>");
+  static_assert(
+      std::is_same_v<FloatType_t<CoordTyped<UnknownUnits, long double>>,
+                     CoordTyped<UnknownUnits, long double>>,
+      "The FloatType of a CoordTyped<Units, Rep> should be "
+      "CoordTyped<Units, Rep>");
+}
diff --git a/gfx/tests/gtest/moz.build b/gfx/tests/gtest/moz.build
index 7c79a84163..3ef2b7bc0e 100644
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -17,6 +17,7 @@ UNIFIED_SOURCES += [
     "TestGfxWidgets.cpp",
     "TestMatrix.cpp",
     "TestMoz2D.cpp",
+    "TestPoint.cpp",
     "TestPolygon.cpp",
     "TestQcms.cpp",
     "TestRegion.cpp",
@@ -24,14 +25,9 @@ UNIFIED_SOURCES += [
     "TestSwizzle.cpp",
     "TestTextures.cpp",
     "TestTreeTraversal.cpp",
+    "TestVsync.cpp",
 ]
 
-# skip the test on windows10-aarch64 due to perma-crash - bug 1544961
-if not (CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] == "aarch64"):
-    UNIFIED_SOURCES += [
-        "TestVsync.cpp",
-    ]
-
 if CONFIG["OS_TARGET"] != "Android":
     UNIFIED_SOURCES += [
         "TestRect.cpp",
@@ -43,7 +39,6 @@ UNIFIED_SOURCES += [
         "TestBase.cpp",
         "TestBugs.cpp",
         "TestCairo.cpp",
-        "TestPoint.cpp",
         "TestScaling.cpp",
     ]
 ]
@@ -70,6 +65,7 @@ LOCAL_INCLUDES += [
     "/gfx/layers",
     "/gfx/ots/src",
     "/gfx/qcms",
+    "/layout/base",
 ]
 
 FINAL_LIBRARY = "xul-gtest"
diff --git a/gfx/tests/reftest/1870240-colrv1-cycle-notref.html b/gfx/tests/reftest/1870240-colrv1-cycle-notref.html
new file mode 100644
index 0000000000..78338e7bc6
--- /dev/null
+++ b/gfx/tests/reftest/1870240-colrv1-cycle-notref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<style>
+@font-face {
+font-family: ctest;
+src: url("MISSING.ttf");
+}
+
+.test {
+font-size: 120px;
+font-family: ctest, cursive;
+}
+</style>
+<div class="test">󱌀󱌆</div>
diff --git a/gfx/tests/reftest/1870240-colrv1-cycle.html b/gfx/tests/reftest/1870240-colrv1-cycle.html
new file mode 100644
index 0000000000..5719f13557
--- /dev/null
+++ b/gfx/tests/reftest/1870240-colrv1-cycle.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<style>
+@font-face {
+font-family: ctest;
+src: url("1870240-test_glyphs-glyf_colr_1.ttf");
+}
+
+.test {
+font-size: 120px;
+font-family: ctest, cursive;
+}
+</style>
+<div class="test">󱌀󱌆</div>
diff --git a/gfx/tests/reftest/1870240-test_glyphs-glyf_colr_1.ttf b/gfx/tests/reftest/1870240-test_glyphs-glyf_colr_1.ttf
new file mode 100644
index 0000000000..082aaac33c
--- /dev/null
+++ b/gfx/tests/reftest/1870240-test_glyphs-glyf_colr_1.ttf
diff --git a/gfx/tests/reftest/reftest.list b/gfx/tests/reftest/reftest.list
index dcdac53c67..b49697c2e4 100644
--- a/gfx/tests/reftest/reftest.list
+++ b/gfx/tests/reftest/reftest.list
@@ -32,7 +32,7 @@ skip-if(geckoview) fuzzy-if(!useDrawSnapshot,0-255,0-1050) fuzzy-if(useDrawSnaps
 fuzzy(64-99,506-645) == 1696439-1.html 1696439-1-ref.html
 random-if(gtkWidget) == 1722689-1.html 1722689-1-ref.html
 fuzzy-if(useDrawSnapshot,255-255,5-5) == 1724901-1.html 1724901-1-ref.html
-pref(image.downscale-during-decode.enabled,true) skip-if(Android) fuzzy-if(useDrawSnapshot&&fission,203-203,193600-193600) HTTP == 1724901-2.html 1724901-2-ref.html
+pref(image.downscale-during-decode.enabled,true) skip-if(Android) fuzzy-if(useDrawSnapshot,203-203,193600-193600) HTTP == 1724901-2.html 1724901-2-ref.html
 == 1760747-1.html 1760747-1-ref.html
 != 1761685-1.html 1761685-1-ref.html
 fuzzy(0-9,0-305) == 1761460.html 1761460-ref.html
@@ -45,3 +45,4 @@ fuzzy(0-1,0-240) == 1812341.html 1812341-ref.html
 random-if(gtkWidget) fuzzy-if(Android,0-125,0-106) == 1845828-1.html 1845828-1-ref.html # Result on Linux depends on font configuration/hinting/etc, affecting whether subpixel positioning is used
 fuzzy-if(!winWidget,0-1,0-4) fuzzy-if(winWidget,14-14,245-245) == 1853216-1.html 1853216-1-ref.html
 fuzzy-if(winWidget,0-1,0-13) == 1873708-emoji-canvas-filter.html 1873708-emoji-canvas-filter-ref.html
+!= 1870240-colrv1-cycle.html 1870240-colrv1-cycle-notref.html