From 730332ba08e7de7a8ef5837cd73f562d48e29ebc Mon Sep 17 00:00:00 2001
From: lorp <lorp@lorp.org>
Date: Thu, 25 Jul 2024 01:28:03 +0100
Subject: [PATCH] Better handle possibility of slow rendering: - use
 document.fonts.ready.then() after the font load - use
 window.requestAnimationFrame() after each style change

---
 src/fencer.js | 53 +++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/fencer.js b/src/fencer.js
index b3d8d05..c382ed1 100644
--- a/src/fencer.js
+++ b/src/fencer.js
@@ -2027,31 +2027,34 @@ function initFencer() {
 			// load the font and attach it to the document
 			const fontFace = new FontFace("avar2-checker", arrayBuffer);
 			document.fonts.add(fontFace);
-
-			// prepare the test div
-			const testDiv = EL("div");
-			testDiv.style.fontFamily = "avar2-checker";
-			testDiv.style.fontSize = "100px";
-			testDiv.style.display = "inline-block";
-			testDiv.textContent = "B"; // the B glyph varies in width with avar2
-			Q(".window-canvas").append(testDiv); // add the test div to the document
-
-			// perform the test on the div and store result
-			testDiv.style.fontVariationSettings = "'AVAR' 0";
-			const width0 = testDiv.getBoundingClientRect().width;
-			testDiv.style.fontVariationSettings = "'AVAR' 100";
-			const width100 = testDiv.getBoundingClientRect().width;		
-			GLOBAL.avar2Active = (width100 > width0); // assign the global
-
-			// clean up
-			testDiv.remove(); // remove the test div
-
-			// switch to harfbuzz if avar2 is unsupported by this browser
-			if (!GLOBAL.avar2Active) {
-				Q("#renderer").value = "harfbuzz";
-				Q("#renderer").dispatchEvent(new Event("change"));
-			}
-
+			document.fonts.ready.then(() => {
+
+				// prepare the test div
+				const testDiv = EL("div");
+				testDiv.style.fontFamily = "avar2-checker";
+				testDiv.style.fontSize = "100px";
+				testDiv.style.display = "inline-block";
+				testDiv.textContent = "B"; // the B glyph varies in width with avar2
+				Q(".window-canvas").append(testDiv); // add the test div to the document
+
+				// perform tests on the div and store results
+				testDiv.style.fontVariationSettings = "'AVAR' 0";
+				window.requestAnimationFrame(() => { // ensures the browser has had a chance to render the content in the div
+					const width0 = testDiv.getBoundingClientRect().width;
+					testDiv.style.fontVariationSettings = "'AVAR' 100";
+					window.requestAnimationFrame(() => { // ensures the browser has had a chance to render the content in the div
+						const width100 = testDiv.getBoundingClientRect().width;		
+						GLOBAL.avar2Active = (width100 > width0); // assign the global
+						testDiv.remove(); // clean up: remove the test div
+		
+						// switch to harfbuzz if avar2 is unsupported by this browser
+						if (!GLOBAL.avar2Active) {
+							Q("#renderer").value = "harfbuzz";
+							Q("#renderer").dispatchEvent(new Event("change"));
+						}
+					});	
+				});
+			});
 		});