Skip to content

Commit 66c6a35

Browse files
committed
Delete "gestureStartTime" tracking
We don't actually ever use this because startGestureTransition is not allowed to be async and so we never show the delta in time from when it starts until the optimistic update happens.
1 parent 0589eef commit 66c6a35

File tree

3 files changed

+17
-85
lines changed

3 files changed

+17
-85
lines changed

packages/react-reconciler/src/ReactFiberPerformanceTrack.js

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,6 @@ export function logBlockingStart(
753753
}
754754

755755
export function logGestureStart(
756-
startTime: number,
757756
updateTime: number,
758757
eventTime: number,
759758
eventType: null | string,
@@ -774,22 +773,15 @@ export function logGestureStart(
774773
} else {
775774
updateTime = renderStartTime;
776775
}
777-
if (startTime > 0) {
778-
if (startTime > updateTime) {
779-
startTime = updateTime;
780-
}
781-
} else {
782-
startTime = updateTime;
783-
}
784776
if (eventTime > 0) {
785-
if (eventTime > startTime) {
786-
eventTime = startTime;
777+
if (eventTime > updateTime) {
778+
eventTime = updateTime;
787779
}
788780
} else {
789-
eventTime = startTime;
781+
eventTime = updateTime;
790782
}
791783

792-
if (startTime > eventTime && eventType !== null) {
784+
if (updateTime > eventTime && eventType !== null) {
793785
// Log the time from the event timeStamp until we started a gesture.
794786
const color = eventIsRepeat ? 'secondary-light' : 'warning';
795787
if (__DEV__ && debugTask) {
@@ -798,7 +790,7 @@ export function logGestureStart(
798790
console,
799791
eventIsRepeat ? 'Consecutive' : 'Event: ' + eventType,
800792
eventTime,
801-
startTime,
793+
updateTime,
802794
currentTrack,
803795
LANES_TRACK_GROUP,
804796
color,
@@ -808,36 +800,10 @@ export function logGestureStart(
808800
console.timeStamp(
809801
eventIsRepeat ? 'Consecutive' : 'Event: ' + eventType,
810802
eventTime,
811-
startTime,
812-
currentTrack,
813-
LANES_TRACK_GROUP,
814-
color,
815-
);
816-
}
817-
}
818-
if (updateTime > startTime) {
819-
// Log the time from when we started a gesture until we called setState or started rendering.
820-
if (__DEV__ && debugTask) {
821-
debugTask.run(
822-
// $FlowFixMe[method-unbinding]
823-
console.timeStamp.bind(
824-
console,
825-
'Gesture',
826-
startTime,
827-
updateTime,
828-
currentTrack,
829-
LANES_TRACK_GROUP,
830-
'primary-dark',
831-
),
832-
);
833-
} else {
834-
console.timeStamp(
835-
'Gesture',
836-
startTime,
837803
updateTime,
838804
currentTrack,
839805
LANES_TRACK_GROUP,
840-
'primary-dark',
806+
color,
841807
);
842808
}
843809
}
@@ -846,8 +812,8 @@ export function logGestureStart(
846812
const label = isPingedUpdate
847813
? 'Promise Resolved'
848814
: renderStartTime - updateTime > 5
849-
? 'Update Blocked'
850-
: 'Update';
815+
? 'Gesture Blocked'
816+
: 'Gesture';
851817
if (__DEV__) {
852818
const properties = [];
853819
if (updateComponentName != null) {

packages/react-reconciler/src/ReactFiberWorkLoop.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ import {
284284
blockingEventIsRepeat,
285285
blockingSuspendedTime,
286286
gestureClampTime,
287-
gestureStartTime,
288287
gestureUpdateTime,
289288
gestureUpdateTask,
290289
gestureUpdateType,
@@ -1982,10 +1981,6 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
19821981
workInProgressUpdateTask = null;
19831982
if (isGestureRender(lanes)) {
19841983
workInProgressUpdateTask = gestureUpdateTask;
1985-
const clampedStartTime =
1986-
gestureStartTime >= 0 && gestureStartTime < gestureClampTime
1987-
? gestureClampTime
1988-
: gestureStartTime;
19891984
const clampedUpdateTime =
19901985
gestureUpdateTime >= 0 && gestureUpdateTime < gestureClampTime
19911986
? gestureClampTime
@@ -2019,7 +2014,6 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
20192014
);
20202015
}
20212016
logGestureStart(
2022-
clampedStartTime,
20232017
clampedUpdateTime,
20242018
clampedEventTime,
20252019
gestureEventType,

packages/react-reconciler/src/ReactProfilerTimer.js

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ export let blockingEventIsRepeat: boolean = false;
7777
export let blockingSuspendedTime: number = -1.1;
7878

7979
export let gestureClampTime: number = -0;
80-
export let gestureStartTime: number = -1.1; // First startGestureTransition call before setOptimistic.
8180
export let gestureUpdateTime: number = -1.1; // First setOptimistic scheduled inside startGestureTransition.
8281
export let gestureUpdateTask: null | ConsoleTask = null; // First sync setState's stack trace.
8382
export let gestureUpdateType: UpdateType = 0;
@@ -134,18 +133,16 @@ export function startUpdateTimerByLane(
134133
if (__DEV__ && fiber != null) {
135134
gestureUpdateComponentName = getComponentNameFromFiber(fiber);
136135
}
137-
if (gestureStartTime < 0) {
138-
const newEventTime = resolveEventTimeStamp();
139-
const newEventType = resolveEventType();
140-
if (
141-
newEventTime !== gestureEventTime ||
142-
newEventType !== gestureEventType
143-
) {
144-
gestureEventIsRepeat = false;
145-
}
146-
gestureEventTime = newEventTime;
147-
gestureEventType = newEventType;
136+
const newEventTime = resolveEventTimeStamp();
137+
const newEventType = resolveEventType();
138+
if (
139+
newEventTime !== gestureEventTime ||
140+
newEventType !== gestureEventType
141+
) {
142+
gestureEventIsRepeat = false;
148143
}
144+
gestureEventTime = newEventTime;
145+
gestureEventType = newEventType;
149146
}
150147
} else if (isBlockingLane(lane)) {
151148
if (blockingUpdateTime < 0) {
@@ -334,36 +331,12 @@ export function clearTransitionTimers(): void {
334331
transitionClampTime = now();
335332
}
336333

337-
export function startGestureTransitionTimer(): void {
338-
if (!enableProfilerTimer || !enableComponentPerformanceTrack) {
339-
return;
340-
}
341-
if (gestureStartTime < 0 && gestureUpdateTime < 0) {
342-
gestureStartTime = now();
343-
const newEventTime = resolveEventTimeStamp();
344-
const newEventType = resolveEventType();
345-
if (
346-
newEventTime !== gestureEventTime ||
347-
newEventType !== gestureEventType
348-
) {
349-
gestureEventIsRepeat = false;
350-
}
351-
gestureEventTime = newEventTime;
352-
gestureEventType = newEventType;
353-
}
354-
}
355-
356334
export function hasScheduledGestureTransitionWork(): boolean {
357335
// If we have call setOptimistic on a gesture
358336
return gestureUpdateTime > -1;
359337
}
360338

361-
export function clearGestureTransitionTimer(): void {
362-
gestureStartTime = -1.1;
363-
}
364-
365339
export function clearGestureTimers(): void {
366-
gestureStartTime = -1.1;
367340
gestureUpdateTime = -1.1;
368341
gestureUpdateType = 0;
369342
gestureSuspendedTime = -1.1;
@@ -374,7 +347,6 @@ export function clearGestureTimers(): void {
374347
export function clearGestureUpdates(): void {
375348
// Same as clearGestureTimers but doesn't reset the clamp time because we didn't
376349
// actually emit a render.
377-
gestureStartTime = -1.1;
378350
gestureUpdateTime = -1.1;
379351
gestureUpdateType = 0;
380352
gestureSuspendedTime = -1.1;

0 commit comments

Comments
 (0)