Bug 1692609 - Update tests for a higher-precision RFP r=jgilbert

Differential Revision: https://phabricator.services.mozilla.com/D148123

browser/components/resistfingerprinting/test/browser/head.js

@@ -65,10 +65,11 @@ let setupPerformanceAPISpoofAndDisableTest = async function(
   let win = await BrowserTestUtils.openNewBrowserWindow();
   let tab = await BrowserTestUtils.openNewForegroundTab(win.gBrowser, url);
 
-  // No matter what we set the precision to, if we're in ResistFingerprinting mode
-  // we use the larger of the precision pref and the constant 100ms
+  // No matter what we set the precision to, if we're in ResistFingerprinting
+  // mode we use the larger of the precision pref and the RFP time-atom constant
   if (resistFingerprinting) {
-    expectedPrecision = expectedPrecision < 100 ? 100 : expectedPrecision;
+    const RFP_TIME_ATOM_MS = 16.667;
+    expectedPrecision = Math.max(RFP_TIME_ATOM_MS, expectedPrecision);
   }
   await SpecialPowers.spawn(
     tab.linkedBrowser,
@@ -95,30 +96,35 @@ let setupPerformanceAPISpoofAndDisableTest = async function(
 };
 
 let isTimeValueRounded = (x, expectedPrecision) => {
-  let rounded = Math.floor(x / expectedPrecision) * expectedPrecision;
+  const nearestExpected = Math.round(x / expectedPrecision) * expectedPrecision;
   // First we do the perfectly normal check that should work just fine
-  if (rounded === x || x === 0) {
+  if (x === nearestExpected) {
     return true;
   }
 
-  // When we're diving by non-whole numbers, we may not get perfect
+  // When we're dividing by non-whole numbers, we may not get perfect
   // multiplication/division because of floating points.
   // When dealing with ms since epoch, a double's precision is on the order
   // of 1/5 of a microsecond, so we use a value a little higher than that as
   // our epsilon.
   // To be clear, this error is introduced in our re-calculation of 'rounded'
   // above in JavaScript.
-  if (Math.abs(rounded - x + expectedPrecision) < 0.0005) {
-    return true;
-  } else if (Math.abs(rounded - x) < 0.0005) {
+  const error = Math.abs(x - nearestExpected);
+  if (Math.abs(error) < 0.0005) {
     return true;
   }
 
   // Then we handle the case where you're sub-millisecond and the timer is not
   // We check that the timer is not sub-millisecond by assuming it is not if it
   // returns an even number of milliseconds
-  if (expectedPrecision < 1 && Math.round(x) == x) {
-    if (Math.round(rounded) == x) {
+  if (
+    Math.round(expectedPrecision) != expectedPrecision &&
+    Math.round(x) == x
+  ) {
+    let acceptableIntRounding = false;
+    acceptableIntRounding |= Math.floor(nearestExpected) == x;
+    acceptableIntRounding |= Math.ceil(nearestExpected) == x;
+    if (acceptableIntRounding) {
       return true;
     }
   }
@@ -129,12 +135,10 @@ let isTimeValueRounded = (x, expectedPrecision) => {
       expectedPrecision +
       " Measured Value: " +
       x +
-      " Rounded Vaue: " +
-      rounded +
-      " Fuzzy1: " +
-      Math.abs(rounded - x + expectedPrecision) +
-      " Fuzzy 2: " +
-      Math.abs(rounded - x)
+      " Nearest Expected Vaue: " +
+      nearestExpected +
+      " Error: " +
+      error
   );
 
   return false;
@@ -169,9 +173,10 @@ let setupAndRunCrossOriginIsolatedTest = async function(
   );
 
   // No matter what we set the precision to, if we're in ResistFingerprinting
-  // mode we use the larger of the precision pref and the constant 100ms
+  // mode we use the larger of the precision pref and the RFP time-atom constant
   if (resistFingerprinting) {
-    expectedPrecision = expectedPrecision < 100 ? 100 : expectedPrecision;
+    const RFP_TIME_ATOM_MS = 16.667;
+    expectedPrecision = Math.max(RFP_TIME_ATOM_MS, expectedPrecision);
   }
   await SpecialPowers.spawn(
     tab.linkedBrowser,

browser/components/resistfingerprinting/test/mochitest/test_animation_api.html

@@ -21,9 +21,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1382545
 
   function runTest() {
     // No matter what we set the precision to, if we're in ResistFingerprinting mode
-    // we use the larger of the precision pref and the constant 100ms
+    // we use the larger of the precision pref and the constant RFP time-atom
     if (resistFingerprinting) {
-      expectedPrecision = expectedPrecision < 100000 ? 100000 : expectedPrecision;
+      const RFP_TIME_ATOM_MS = 16.667;
+      expectedPrecision = Math.max(1000*RFP_TIME_ATOM_MS, expectedPrecision);
     }
     window.open("file_animation_api.html");
   }

browser/components/resistfingerprinting/test/mochitest/test_reduce_time_precision.html

@@ -33,40 +33,43 @@ https://trac.torproject.org/projects/tor/ticket/1517
     "audioContext.currentTime * 1000",
   ]);
 
-  let isRounded = (x, expectedPrecision) => {
-    let rounded = (Math.floor(x / expectedPrecision) * expectedPrecision);
+  // From browser/components/resistfingerprinting/test/browser/head.js:
+  function isTimeValueRounded(x, expectedPrecision) {
+    const nearestExpected = Math.round(x / expectedPrecision) * expectedPrecision;
     // First we do the perfectly normal check that should work just fine
-    if (rounded === x || x === 0)
+    if (x === nearestExpected)
       return true;
 
-  // When we're diving by non-whole numbers, we may not get perfect
-  // multiplication/division because of floating points.
-  // When dealing with ms since epoch, a double's precision is on the order
-  // of 1/5 of a microsecond, so we use a value a little higher than that as
-  // our epsilon.
-  // To be clear, this error is introduced in our re-calculation of 'rounded'
-  // above in JavaScript.
-  if (Math.abs(rounded - x + expectedPrecision) < .0005) {
-    return true;
-  } else if (Math.abs(rounded - x) < .0005) {
-    return true;
-  }
+    // When we're diving by non-whole numbers, we may not get perfect
+    // multiplication/division because of floating points.
+    // When dealing with ms since epoch, a double's precision is on the order
+    // of 1/5 of a microsecond, so we use a value a little higher than that as
+    // our epsilon.
+    // To be clear, this error is introduced in our re-calculation of 'rounded'
+    // above in JavaScript.
+    const error = Math.abs(x - nearestExpected);
+    if (Math.abs(error) < .0005) {
+      return true;
+    }
 
     // Then we handle the case where you're sub-millisecond and the timer is not
     // We check that the timer is not sub-millisecond by assuming it is not if it
     // returns an even number of milliseconds
-    if (expectedPrecision < 1 && Math.round(x) == x) {
-      if (Math.round(rounded) == x) {
+    if (Math.round(expectedPrecision) != expectedPrecision && Math.round(x) == x) {
+      let acceptableIntRounding = false;
+      acceptableIntRounding |= (Math.floor(nearestExpected) == x);
+      acceptableIntRounding |= (Math.ceil(nearestExpected) == x);
+      if (acceptableIntRounding) {
         return true;
       }
     }
 
     ok(false, "Looming Test Failure, Additional Debugging Info: Expected Precision: " + expectedPrecision + " Measured Value: " + x +
-      " Rounded Vaue: " + rounded + " Fuzzy1: " + Math.abs(rounded - x + expectedPrecision) +
-      " Fuzzy 2: " + Math.abs(rounded - x));
+      " Nearest Expected Vaue: " + nearestExpected + " Error: " + error);
 
     return false;
-  };
+  }
+
 
   // ================================================================================================
   // ================================================================================================
@@ -79,7 +82,7 @@ https://trac.torproject.org/projects/tor/ticket/1517
         let timeStamps = event.data;
         for (let i = 0; i < timeStampCodes.length; i++) {
           let timeStamp = timeStamps[i];
-          ok(isRounded(timeStamp, expectedPrecision),
+          ok(isTimeValueRounded(timeStamp, expectedPrecision),
             "pref: " + prefname + " - '" +
              "'" + timeStampCodes[i] +
              "' should be rounded to nearest " + expectedPrecision + " ms in workers; saw " +
@@ -116,9 +119,10 @@ https://trac.torproject.org/projects/tor/ticket/1517
               ]});
 
     // No matter what we set the precision to, if we're in ResistFingerprinting mode
-    // we use the larger of the precision pref and the constant 100ms
+    // we use the larger of the precision pref and the RFP time-atom constant
     if (resistFingerprinting) {
-      expectedPrecision = expectedPrecision < 100 ? 100 : expectedPrecision;
+      const RFP_TIME_ATOM_MS = 16.667;
+      expectedPrecision = Math.max(RFP_TIME_ATOM_MS, expectedPrecision);
     }
 
     let worker2 = new Worker("worker_child.js");
@@ -155,9 +159,10 @@ https://trac.torproject.org/projects/tor/ticket/1517
               ]});
 
     // No matter what we set the precision to, if we're in ResistFingerprinting mode
-    // we use the larger of the precision pref and the constant 100ms
+    // we use the larger of the precision pref and the constant RFP time-atom
     if (resistFingerprinting) {
-      expectedPrecision = expectedPrecision < 100 ? 100 : expectedPrecision;
+      const RFP_TIME_ATOM_MS = 16.667;
+      expectedPrecision = Math.max(RFP_TIME_ATOM_MS, expectedPrecision);
     }
 
     // Loop through each timeStampCode, evaluate it,
@@ -174,7 +179,7 @@ https://trac.torproject.org/projects/tor/ticket/1517
       if (timeStampCode.includes("audioContext") && expectedPrecision < 5.4)
         continue;
 
-      ok(isRounded(timeStamp, expectedPrecision),
+      ok(isTimeValueRounded(timeStamp, expectedPrecision),
         "pref: " + prefname + " - '" +
          "'" + timeStampCode +
          "' should be rounded to nearest " +

dom/media/test/test_video_stats_resistfingerprinting.html

@@ -22,11 +22,12 @@ https://trac.torproject.org/projects/tor/ticket/15757
   var manager = new MediaTestManager;
   const SPOOFED_FRAMES_PER_SECOND = 30;
   const SPOOFED_DROPPED_RATIO = 0.05;
+  const MS_PER_TIME_ATOM = 100; // Not the default anymore, but what we test here.
   // Push the setting of 'privacy.resistFingerprinting' into gTestPrefs, which
   // will be set during MediaTestManager.runTests().
   gTestPrefs.push(
     ["privacy.resistFingerprinting", true],
-    ["privacy.resistFingerprinting.reduceTimerPrecision.microseconds", 100000],
+    ["privacy.resistFingerprinting.reduceTimerPrecision.microseconds", MS_PER_TIME_ATOM * 1000],
     ["privacy.resistFingerprinting.reduceTimerPrecision.jitter", false],
     // We use 240p as the target resoultion since 480p is greater than every video
     // source in our test suite, so we need to use 240p here for allowing us to
@@ -41,7 +42,9 @@ https://trac.torproject.org/projects/tor/ticket/15757
 
   function checkStats(v, shouldDrop) {
     // Rounding the current time to 100ms.
-    let currentTime = Math.floor(v.currentTime * 10) / 10;
+    const secondsPerAtom = MS_PER_TIME_ATOM / 1000;
+    const currentTimeAtoms = Math.floor(v.currentTime / secondsPerAtom);
+    const currentTime = currentTimeAtoms * secondsPerAtom;
     let dropRate = 0;
 
     if (shouldDrop) {