diff --git a/schemas/telemetry/bhr/bhr.4.schema.json b/schemas/telemetry/bhr/bhr.4.schema.json index 8a7f7c6ed..315d89bf0 100644 --- a/schemas/telemetry/bhr/bhr.4.schema.json +++ b/schemas/telemetry/bhr/bhr.4.schema.json @@ -1148,6 +1148,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1167,6 +1175,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/crash/crash.4.schema.json b/schemas/telemetry/crash/crash.4.schema.json index c90a5659f..35a7c29d2 100644 --- a/schemas/telemetry/crash/crash.4.schema.json +++ b/schemas/telemetry/crash/crash.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/dnssec-study-v1/dnssec-study-v1.4.schema.json b/schemas/telemetry/dnssec-study-v1/dnssec-study-v1.4.schema.json index cef6f3085..424aae73b 100644 --- a/schemas/telemetry/dnssec-study-v1/dnssec-study-v1.4.schema.json +++ b/schemas/telemetry/dnssec-study-v1/dnssec-study-v1.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/event/event.4.schema.json b/schemas/telemetry/event/event.4.schema.json index 2ebb638ce..c15427b73 100644 --- a/schemas/telemetry/event/event.4.schema.json +++ b/schemas/telemetry/event/event.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/first-shutdown/first-shutdown.4.schema.json b/schemas/telemetry/first-shutdown/first-shutdown.4.schema.json index 1aee91973..1fef744ed 100644 --- a/schemas/telemetry/first-shutdown/first-shutdown.4.schema.json +++ b/schemas/telemetry/first-shutdown/first-shutdown.4.schema.json @@ -1161,6 +1161,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1180,6 +1188,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/heartbeat/heartbeat.4.schema.json b/schemas/telemetry/heartbeat/heartbeat.4.schema.json index 5421d0337..b2f7d1838 100644 --- a/schemas/telemetry/heartbeat/heartbeat.4.schema.json +++ b/schemas/telemetry/heartbeat/heartbeat.4.schema.json @@ -1155,6 +1155,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1174,6 +1182,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/main/main.4.schema.json b/schemas/telemetry/main/main.4.schema.json index f7b9d8c80..32569991c 100644 --- a/schemas/telemetry/main/main.4.schema.json +++ b/schemas/telemetry/main/main.4.schema.json @@ -1161,6 +1161,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1180,6 +1188,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/modules/modules.4.schema.json b/schemas/telemetry/modules/modules.4.schema.json index 98830f8df..0a6045a71 100644 --- a/schemas/telemetry/modules/modules.4.schema.json +++ b/schemas/telemetry/modules/modules.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/new-profile/new-profile.4.schema.json b/schemas/telemetry/new-profile/new-profile.4.schema.json index e117778c6..682e0a251 100644 --- a/schemas/telemetry/new-profile/new-profile.4.schema.json +++ b/schemas/telemetry/new-profile/new-profile.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/saved-session/saved-session.4.schema.json b/schemas/telemetry/saved-session/saved-session.4.schema.json index 2f13b6756..9d57bbf54 100644 --- a/schemas/telemetry/saved-session/saved-session.4.schema.json +++ b/schemas/telemetry/saved-session/saved-session.4.schema.json @@ -1161,6 +1161,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1180,6 +1188,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/shield-icq-v1/shield-icq-v1.4.schema.json b/schemas/telemetry/shield-icq-v1/shield-icq-v1.4.schema.json index 7107b6deb..e0bed7739 100644 --- a/schemas/telemetry/shield-icq-v1/shield-icq-v1.4.schema.json +++ b/schemas/telemetry/shield-icq-v1/shield-icq-v1.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/testpilot/testpilot.4.schema.json b/schemas/telemetry/testpilot/testpilot.4.schema.json index 9deb446d2..b213b9cf4 100644 --- a/schemas/telemetry/testpilot/testpilot.4.schema.json +++ b/schemas/telemetry/testpilot/testpilot.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/third-party-modules/third-party-modules.4.schema.json b/schemas/telemetry/third-party-modules/third-party-modules.4.schema.json index bfad29083..a3cfa20aa 100644 --- a/schemas/telemetry/third-party-modules/third-party-modules.4.schema.json +++ b/schemas/telemetry/third-party-modules/third-party-modules.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/uninstall/uninstall.4.schema.json b/schemas/telemetry/uninstall/uninstall.4.schema.json index e1d98c540..593a0f407 100644 --- a/schemas/telemetry/uninstall/uninstall.4.schema.json +++ b/schemas/telemetry/uninstall/uninstall.4.schema.json @@ -1148,6 +1148,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1167,6 +1175,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/untrusted-modules/untrusted-modules.4.schema.json b/schemas/telemetry/untrusted-modules/untrusted-modules.4.schema.json index 2e43f66ce..4cae63ba9 100644 --- a/schemas/telemetry/untrusted-modules/untrusted-modules.4.schema.json +++ b/schemas/telemetry/untrusted-modules/untrusted-modules.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/update/update.4.schema.json b/schemas/telemetry/update/update.4.schema.json index d45f9445b..d63a94f3c 100644 --- a/schemas/telemetry/update/update.4.schema.json +++ b/schemas/telemetry/update/update.4.schema.json @@ -1144,6 +1144,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1163,6 +1171,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/schemas/telemetry/voice/voice.4.schema.json b/schemas/telemetry/voice/voice.4.schema.json index a2e5240c8..59679d60c 100644 --- a/schemas/telemetry/voice/voice.4.schema.json +++ b/schemas/telemetry/voice/voice.4.schema.json @@ -1147,6 +1147,14 @@ "monitors": { "items": { "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "pseudoDisplay": { "type": "boolean" }, @@ -1166,6 +1174,10 @@ "type": "object" }, "type": "array" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } }, "type": "object" diff --git a/templates/include/telemetry/environment.1.schema.json b/templates/include/telemetry/environment.1.schema.json index 67eb7ffa8..b6bd2021a 100644 --- a/templates/include/telemetry/environment.1.schema.json +++ b/templates/include/telemetry/environment.1.schema.json @@ -903,6 +903,14 @@ "items": { "type": "object", "properties": { + "contentsScaleFactor": { + "description": "The number of device pixels per desktop pixel for this screen.", + "type": "number" + }, + "defaultCSSScaleFactor": { + "description": "The default number of device pixels per unscaled CSS pixel for this screen.", + "type": "number" + }, "screenWidth": { "type": "integer" }, @@ -1103,6 +1111,10 @@ "TargetFrameRate": { "description": "Frame rate in Hz, typically 60 or more, see bug 1840381", "type": "integer" + }, + "textScaleFactor": { + "description": "Text scale supported by GTK and Windows. 1 corresponds to 100%.", + "type": "number" } } }, diff --git a/validation/telemetry/main.4.sample.pass.json b/validation/telemetry/main.4.sample.pass.json index 2f2937ebf..bae3f0846 100644 --- a/validation/telemetry/main.4.sample.pass.json +++ b/validation/telemetry/main.4.sample.pass.json @@ -389,6 +389,7 @@ "D2DEnabled": null, "LowEndMachine": false, "DWriteEnabled": null, + "textScaleFactor": 1, "adapters": [ { "GPUActive": true, @@ -410,6 +411,12 @@ "scale": 2, "screenHeight": 900, "screenWidth": 1440 + }, + { + "contentsScaleFactor": 2, + "defaultCSSScaleFactor": 2, + "screenHeight": 900, + "screenWidth": 1440 } ] },