From 9c77ffb444598c32c8f92c8d79e406959a10445b Mon Sep 17 00:00:00 2001 From: Flarnie Marchan Date: Tue, 24 Apr 2018 08:54:31 -0700 Subject: [PATCH] Dedup conditional in ReactScheduler (#12680) **what is the change?:** We had a condition to set either 'performance.now' or 'Date.now' as the 'now' function. Then later we had another conditional checking again if 'performance.now' was supported, and using it if so, otherwise falling back to 'Date.now'. More efficient to just use the 'now' shortcut defined above. **why make this change?:** Fewer lines, clearer code. **test plan:** Now that we have tests we can run them :) --- .../react-scheduler/src/ReactScheduler.js | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/packages/react-scheduler/src/ReactScheduler.js b/packages/react-scheduler/src/ReactScheduler.js index 362a3f34b7b9b..b15e5f4428ee5 100644 --- a/packages/react-scheduler/src/ReactScheduler.js +++ b/packages/react-scheduler/src/ReactScheduler.js @@ -100,27 +100,13 @@ if (!ExecutionEnvironment.canUseDOM) { let previousFrameTime = 33; let activeFrameTime = 33; - let frameDeadlineObject; - if (hasNativePerformanceNow) { - frameDeadlineObject = { - didTimeout: false, - timeRemaining() { - // We assume that if we have a performance timer that the rAF callback - // gets a performance timer value. Not sure if this is always true. - const remaining = frameDeadline - performance.now(); - return remaining > 0 ? remaining : 0; - }, - }; - } else { - frameDeadlineObject = { - didTimeout: false, - timeRemaining() { - // Fallback to Date.now() - const remaining = frameDeadline - Date.now(); - return remaining > 0 ? remaining : 0; - }, - }; - } + const frameDeadlineObject = { + didTimeout: false, + timeRemaining() { + const remaining = frameDeadline - now(); + return remaining > 0 ? remaining : 0; + }, + }; // We use the postMessage trick to defer idle work until after the repaint. const messageKey =