Skip to content

Commit

Permalink
Remove unused CANCELED entry from ImageLoadStatus
Browse files Browse the repository at this point in the history
Reviewed By: oprisnik

Differential Revision: D58729945

fbshipit-source-id: 3669147dee91bf2bfcf4ed8a84f3338850da75c5
  • Loading branch information
steelrooter authored and facebook-github-bot committed Jun 19, 2024
1 parent 60b8ca9 commit 1a35431
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,8 @@ public void onRelease(String id) {
if (lastImageLoadStatus != ImageLoadStatus.SUCCESS
&& lastImageLoadStatus != ImageLoadStatus.ERROR
&& lastImageLoadStatus != ImageLoadStatus.DRAW) {
mImagePerfState.setControllerCancelTimeMs(now);
mImagePerfState.setControllerId(id);
// The image request was canceled
mImagePerfMonitor.notifyStatusUpdated(mImagePerfState, ImageLoadStatus.CANCELED);
}

reportViewInvisible(now);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,6 @@ public void onRelease(String id, @Nullable ControllerListener2.Extras extras) {
state.setExtraData(extras);
state.setControllerId(id);

ImageLoadStatus lastImageLoadStatus = state.getImageLoadStatus();
if (lastImageLoadStatus != ImageLoadStatus.SUCCESS
&& lastImageLoadStatus != ImageLoadStatus.ERROR
&& lastImageLoadStatus != ImageLoadStatus.DRAW) {
state.setControllerCancelTimeMs(now);
// The image request was canceled
updateStatus(state, ImageLoadStatus.CANCELED);
}
updateStatus(state, ImageLoadStatus.RELEASED);

if (mReportVisibleOnSubmitAndRelease) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ public void testCancellation() {
verify(mMonotonicClock, times(expectedNumOfTimestamps)).now();
verify(mImagePerfMonitor)
.notifyStatusUpdated(eq(mImagePerfState), eq(ImageLoadStatus.REQUESTED));
verify(mImagePerfMonitor)
.notifyStatusUpdated(eq(mImagePerfState), eq(ImageLoadStatus.CANCELED));
verify(mImagePerfState).setControllerSubmitTimeMs(startTime);
verify(mImagePerfState).setControllerCancelTimeMs(imageReleaseTime);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ enum class ImageLoadStatus(val value: Int) {
REQUESTED(0),
INTERMEDIATE_AVAILABLE(2),
SUCCESS(3),
CANCELED(4),
ERROR(5),
DRAW(6),
EMPTY_EVENT(7),
Expand All @@ -26,7 +25,6 @@ enum class ImageLoadStatus(val value: Int) {
return when (this) {
REQUESTED -> "requested"
SUCCESS -> "success"
CANCELED -> "canceled"
INTERMEDIATE_AVAILABLE -> "intermediate_available"
ERROR -> "error"
RELEASED -> "released"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class ImagePerfData {
private final long mControllerIntermediateImageSetTimeMs;
private final long mControllerFinalImageSetTimeMs;
private final long mControllerFailureTimeMs;
private final long mControllerCancelTimeMs;

private final long mImageRequestStartTimeMs;
private final long mImageRequestEndTimeMs;
Expand Down Expand Up @@ -59,7 +58,6 @@ public ImagePerfData(
long controllerIntermediateImageSetTimeMs,
long controllerFinalImageSetTimeMs,
long controllerFailureTimeMs,
long controllerCancelTimeMs,
long imageRequestStartTimeMs,
long imageRequestEndTimeMs,
boolean isPrefetch,
Expand All @@ -81,7 +79,6 @@ public ImagePerfData(
mControllerIntermediateImageSetTimeMs = controllerIntermediateImageSetTimeMs;
mControllerFinalImageSetTimeMs = controllerFinalImageSetTimeMs;
mControllerFailureTimeMs = controllerFailureTimeMs;
mControllerCancelTimeMs = controllerCancelTimeMs;
mImageRequestStartTimeMs = imageRequestStartTimeMs;
mImageRequestEndTimeMs = imageRequestEndTimeMs;
mIsPrefetch = isPrefetch;
Expand Down Expand Up @@ -211,7 +208,6 @@ public String createDebugString() {
.add("controller submit", mControllerSubmitTimeMs)
.add("controller final image", mControllerFinalImageSetTimeMs)
.add("controller failure", mControllerFailureTimeMs)
.add("controller cancel", mControllerCancelTimeMs)
.add("start time", mImageRequestStartTimeMs)
.add("end time", mImageRequestEndTimeMs)
.add("prefetch", mIsPrefetch)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public class ImagePerfState {
private long mControllerIntermediateImageSetTimeMs = UNSET;
private long mControllerFinalImageSetTimeMs = UNSET;
private long mControllerFailureTimeMs = UNSET;
private long mControllerCancelTimeMs = UNSET;

// Image request timings
private long mImageRequestStartTimeMs = UNSET;
Expand Down Expand Up @@ -88,7 +87,6 @@ public void resetPointsTimestamps() {
mControllerSubmitTimeMs = UNSET;
mControllerFinalImageSetTimeMs = UNSET;
mControllerFailureTimeMs = UNSET;
mControllerCancelTimeMs = UNSET;

mVisibilityEventTimeMs = UNSET;
mInvisibilityEventTimeMs = UNSET;
Expand Down Expand Up @@ -136,10 +134,6 @@ public void setControllerFailureTimeMs(long controllerFailureTimeMs) {
mControllerFailureTimeMs = controllerFailureTimeMs;
}

public void setControllerCancelTimeMs(long controllerCancelTimeMs) {
mControllerCancelTimeMs = controllerCancelTimeMs;
}

public void setImageRequestStartTimeMs(long imageRequestStartTimeMs) {
mImageRequestStartTimeMs = imageRequestStartTimeMs;
}
Expand Down Expand Up @@ -195,7 +189,6 @@ public ImagePerfData snapshot() {
mControllerIntermediateImageSetTimeMs,
mControllerFinalImageSetTimeMs,
mControllerFailureTimeMs,
mControllerCancelTimeMs,
mImageRequestStartTimeMs,
mImageRequestEndTimeMs,
mIsPrefetch,
Expand Down

0 comments on commit 1a35431

Please sign in to comment.