Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Exclude chrome in ua from safari version check for colr support #3038

Merged
merged 2 commits into from
May 29, 2019
Merged

Exclude chrome in ua from safari version check for colr support #3038

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26a5bb0
exclude chrome in ua from safari version check for colr support
bwindels May 29, 2019
3793361
always log on return false
bwindels May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/utils/FontManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ limitations under the License.
*/

function safariVersionCheck(ua) {
console.log("Browser is Safari - checking version for COLR support");
bwindels marked this conversation as resolved.
Show resolved Hide resolved
try {
const safariVersionMatch = ua.match(/Mac OS X ([\d|_]+).*Version\/([\d|.]+).*Safari/);
if (safariVersionMatch) {
Expand All @@ -31,33 +32,36 @@ function safariVersionCheck(ua) {
const safariVersion = safariVersionStr.split(".").map(n => parseInt(n, 10));
const colrFontSupported = macOSVersion[0] >= 10 && macOSVersion[1] >= 14 && safariVersion[0] >= 12;
// https://www.colorfonts.wtf/ states safari supports COLR fonts from this version on
console.log(`Browser is Safari - requiring macOS 10.14 and Safari 12, ` +
console.log(`COLR support on Safari requires macOS 10.14 and Safari 12, ` +
`detected Safari ${safariVersionStr} on macOS ${macOSVersionStr}, ` +
`COLR supported: ${colrFontSupported}`);
return colrFontSupported;
}
} catch (err) {
console.error("Couldn't determine Safari version to check COLR font support, assuming no.", err);
console.error("Error in Safari COLR version check", err);
}
console.warn("Couldn't determine Safari version to check COLR font support, assuming no.");
return false;
}

async function isColrFontSupported() {
console.log("Checking for COLR support");

const {userAgent} = navigator;
// Firefox has supported COLR fonts since version 26
// but doesn't support the check below without
// "Extract canvas data" permissions
// when content blocking is enabled.
if (navigator.userAgent.includes("Firefox")) {
if (userAgent.includes("Firefox")) {
console.log("Browser is Firefox - assuming COLR is supported");
return true;
}
// Safari doesn't wait for the font to load (if it doesn't have it in cache)
// to emit the load event on the image, so there is no way to not make the check
// reliable. Instead sniff the version.
if (navigator.userAgent.includes("Safari")) {
return safariVersionCheck(navigator.userAgent);
// Excluding "Chrome", as it's user agent unhelpfully also contains Safari...
if (!userAgent.includes("Chrome") && userAgent.includes("Safari")) {
return safariVersionCheck(userAgent);
}

try {
Expand Down