Skip to content

Commit d87b307

Browse files
authored
Delete the timer based measurement since we've switched over to (#466)
requestAnimationFrame based measurement for 3.0 and found no issues.
1 parent f7c3a70 commit d87b307

File tree

3 files changed

+4
-29
lines changed

3 files changed

+4
-29
lines changed

resources/developer-mode.mjs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export function createDeveloperModeContainer() {
1818
const settings = document.createElement("div");
1919
settings.className = "settings";
2020
settings.append(createUIForIterationCount());
21-
settings.append(createUIForMeasurementMethod());
2221
settings.append(createUIForWarmupSuite());
2322
settings.append(createUIForWarmupBeforeSync());
2423
settings.append(createUIForSyncStepDelay());
@@ -40,12 +39,6 @@ function span(text) {
4039
return span;
4140
}
4241

43-
function createUIForMeasurementMethod() {
44-
return createCheckboxUI("rAF timing", params.measurementMethod === "raf", (isChecked) => {
45-
params.measurementMethod = isChecked ? "raf" : "timer";
46-
});
47-
}
48-
4942
function createUIForWarmupSuite() {
5043
return createCheckboxUI("Use Warmup Suite", params.useWarmupSuite, (isChecked) => {
5144
params.useWarmupSuite = isChecked;
@@ -262,7 +255,7 @@ function updateURL() {
262255
}
263256
}
264257

265-
const defaultParamKeys = ["measurementMethod", "iterationCount", "useWarmupSuite", "warmupBeforeSync", "waitBeforeSync"];
258+
const defaultParamKeys = ["iterationCount", "useWarmupSuite", "warmupBeforeSync", "waitBeforeSync"];
266259
for (const paramKey of defaultParamKeys) {
267260
if (params[paramKey] !== defaultParams[paramKey])
268261
url.searchParams.set(paramKey, params[paramKey]);

resources/shared/params.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class Params {
1515
// Change how a test measurement is triggered and async time is measured:
1616
// "timer": The classic (as in Speedometer 2.x) way using setTimeout
1717
// "raf": Using rAF callbacks, both for triggering the sync part and for measuring async time.
18-
measurementMethod = "raf"; // or "timer"
18+
measurementMethod = "raf";
1919
// Wait time before the sync step in ms.
2020
waitBeforeSync = 0;
2121
// Warmup time before the sync step in ms.
@@ -122,8 +122,8 @@ export class Params {
122122
if (!searchParams.has("measurementMethod"))
123123
return defaultParams.measurementMethod;
124124
const measurementMethod = searchParams.get("measurementMethod");
125-
if (measurementMethod !== "timer" && measurementMethod !== "raf")
126-
throw new Error(`Invalid measurement method: '${measurementMethod}', must be either 'raf' or 'timer'.`);
125+
if (measurementMethod !== "raf")
126+
throw new Error(`Invalid measurement method: '${measurementMethod}', must be 'raf'.`);
127127
searchParams.delete("measurementMethod");
128128
return measurementMethod;
129129
}

resources/shared/test-invoker.mjs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,6 @@ class TestInvoker {
77
}
88
}
99

10-
export class TimerTestInvoker extends TestInvoker {
11-
start() {
12-
return new Promise((resolve) => {
13-
setTimeout(() => {
14-
this._syncCallback();
15-
setTimeout(() => {
16-
this._asyncCallback();
17-
requestAnimationFrame(async () => {
18-
const result = await this._reportCallback();
19-
resolve(result);
20-
});
21-
}, 0);
22-
}, this._params.waitBeforeSync);
23-
});
24-
}
25-
}
26-
2710
export class RAFTestInvoker extends TestInvoker {
2811
start() {
2912
return new Promise((resolve) => {
@@ -50,6 +33,5 @@ export class RAFTestInvoker extends TestInvoker {
5033

5134
export const TEST_INVOKER_LOOKUP = {
5235
__proto__: null,
53-
timer: TimerTestInvoker,
5436
raf: RAFTestInvoker,
5537
};

0 commit comments

Comments
 (0)