Skip to content

Commit 010f2a4

Browse files
committed
Delete unnecessary abstraction
1 parent 9392558 commit 010f2a4

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

src/renderers/shared/fiber/ReactFiberExpirationTime.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,3 @@ function expirationTimeToPriorityLevel(
121121
return LowPriority;
122122
}
123123
exports.expirationTimeToPriorityLevel = expirationTimeToPriorityLevel;
124-
125-
function earlierExpirationTime(
126-
t1: ExpirationTime,
127-
t2: ExpirationTime,
128-
): ExpirationTime {
129-
return t1 !== Done && (t2 === Done || t2 > t1) ? t1 : t2;
130-
}
131-
exports.earlierExpirationTime = earlierExpirationTime;

src/renderers/shared/fiber/ReactFiberScheduler.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ var {
6767
Done,
6868
Never,
6969
msToExpirationTime,
70-
earlierExpirationTime,
7170
priorityToExpirationTime,
7271
expirationTimeToPriorityLevel,
7372
} = require('ReactFiberExpirationTime');
@@ -608,10 +607,12 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
608607
// Bubble up the earliest expiration time.
609608
let child = workInProgress.child;
610609
while (child !== null) {
611-
newExpirationTime = earlierExpirationTime(
612-
newExpirationTime,
613-
child.expirationTime,
614-
);
610+
if (
611+
child.expirationTime !== Done &&
612+
(newExpirationTime === Done || newExpirationTime > child.expirationTime)
613+
) {
614+
newExpirationTime = child.expirationTime;
615+
}
615616
child = child.sibling;
616617
}
617618
workInProgress.expirationTime = newExpirationTime;

0 commit comments

Comments
 (0)