From 4a36705f42782f9fb6a5a85fd42fe8589ee256a4 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Wed, 8 Mar 2023 15:10:37 -0800
Subject: [PATCH] frame: improve photo recycling

---
 src/components/frame/Photo.vue | 51 ++++++++++++++--------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
index 699522b2..6acab2f2 100644
--- a/src/components/frame/Photo.vue
+++ b/src/components/frame/Photo.vue
@@ -45,6 +45,7 @@
       @touchcancel.passive="$emit('touchend', $event)"
     >
       <XImg
+        v-if="src"
         ref="ximg"
         :class="['ximg', 'fill-block', `memories-thumb-${data.key}`]"
         draggable="false"
@@ -101,8 +102,7 @@ export default defineComponent({
 
   data: () => ({
     touchTimer: 0,
-    src: null,
-    hasFaceRect: false,
+    faceSrc: null,
   }),
 
   watch: {
@@ -113,16 +113,10 @@ export default defineComponent({
           oldData.flag & (this.c.FLAG_SELECTED | this.c.FLAG_LOAD_FAIL);
       }
     },
-
-    "data.etag": function () {
-      this.hasFaceRect = false;
-      this.refresh();
-    },
   },
 
   mounted() {
-    this.hasFaceRect = false;
-    this.refresh();
+    this.faceSrc = null;
 
     // Setup video hooks
     const video = this.$refs.video as HTMLVideoElement;
@@ -136,8 +130,8 @@ export default defineComponent({
     clearTimeout(this.touchTimer);
 
     // Clean up blob url if face rect was created
-    if (this.hasFaceRect) {
-      URL.revokeObjectURL(this.src);
+    if (this.faceSrc) {
+      URL.revokeObjectURL(this.faceSrc);
     }
   },
 
@@ -154,6 +148,20 @@ export default defineComponent({
         return utils.getLivePhotoVideoUrl(this.data, true);
       }
     },
+
+    src(): string | null {
+      this.data.etag; // dependency
+
+      if (this.data.flag & this.c.FLAG_PLACEHOLDER) {
+        return null;
+      } else if (this.data.flag & this.c.FLAG_LOAD_FAIL) {
+        return errorsvg;
+      } else if (this.faceSrc) {
+        return this.faceSrc;
+      } else {
+        return this.url();
+      }
+    },
   },
 
   methods: {
@@ -161,21 +169,6 @@ export default defineComponent({
       this.$emit("select", data);
     },
 
-    async refresh() {
-      this.src = await this.getSrc();
-    },
-
-    /** Get src for image to show */
-    async getSrc() {
-      if (this.data.flag & this.c.FLAG_PLACEHOLDER) {
-        return null;
-      } else if (this.data.flag & this.c.FLAG_LOAD_FAIL) {
-        return errorsvg;
-      } else {
-        return this.url();
-      }
-    },
-
     /** Get url of the photo */
     url() {
       let base = 256;
@@ -205,8 +198,7 @@ export default defineComponent({
 
     /** Set src with overlay face rect */
     async addFaceRect() {
-      if (!this.data.facerect || this.hasFaceRect) return;
-      this.hasFaceRect = true;
+      if (!this.data.facerect || this.faceSrc) return;
 
       const canvas = document.createElement("canvas");
       const context = canvas.getContext("2d");
@@ -226,7 +218,7 @@ export default defineComponent({
 
       canvas.toBlob(
         (blob) => {
-          this.src = URL.createObjectURL(blob);
+          this.faceSrc = URL.createObjectURL(blob);
         },
         "image/jpeg",
         0.95
@@ -241,7 +233,6 @@ export default defineComponent({
     /** Error in loading image */
     error(e: any) {
       this.data.flag |= this.c.FLAG_LOAD_FAIL;
-      this.refresh();
     },
 
     toggleSelect() {