tor-browser

commit 78c420564d75a9d5bbdabd2f462ad88a02333b9f
parent 18c8197bbe33cbaf44c33cb2947008cb357a74f6
Author: Alexandru Marc <amarc@mozilla.com>
Date:   Wed, 29 Oct 2025 01:33:52 +0200

Revert "Bug 1996944 - Remove leftover D2D JS_SetProperty call. r=chutten,toolkit-telemetry-reviewers" for causing xpcshell failures @ test_TelemetryEnvironment.js

This reverts commit 699d21d560e2b89179c30d9e58d925e3f783cb63.

Diffstat:
M
toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs
 | 
8
--------
M
widget/windows/GfxInfo.cpp
 | 
7
+++++++

2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs b/toolkit/components/telemetry/tests/unit/TelemetryEnvironmentTesting.sys.mjs
@@ -939,14 +939,6 @@ export var TelemetryEnvironmentTesting = {
     lazy.Assert.equal(typeof gfxData.features.gpuProcess.status, "string");
     lazy.Assert.ok(!!Glean.gfxFeatures.gpuProcess.testGetValue().status);
 
-    if (gIsWindows && !!gfxData.features?.d3d11?.version) {
-      lazy.Assert.equal(typeof gfxData.features.d3d11.version, "number");
-      lazy.Assert.equal(
-        gfxData.features.d3d11.version,
-        Glean.gfxFeatures.d3d11.testGetValue().version
-      );
-    }
-
     try {
       // If we've not got nsIGfxInfoDebug, then this will throw and stop us doing
       // this test.
diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
@@ -1975,6 +1975,13 @@ void GfxInfo::DescribeFeatures(JSContext* aCx, JS::Handle<JSObject*> aObj) {
     val = JS::BooleanValue(blocklisted);
     JS_SetProperty(aCx, obj, "blocklisted", val);
   }
+
+  {
+    const char* version = "1.1";
+    JS::Rooted<JSString*> str(aCx, JS_NewStringCopyZ(aCx, version));
+    JS::Rooted<JS::Value> val(aCx, JS::StringValue(str));
+    JS_SetProperty(aCx, obj, "version", val);
+  }
 }
 
 #ifdef DEBUG