Merge pull request #16379 from Snuffleupagus/sidebar-forceRendering

Simplify the `PDFSidebar.#forceRendering` method
mozilla · May 4, 2023 · 2fab583 · 2fab583
2 parents 4931f29 + 9dcc504
commit 2fab583
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/web/pdf_sidebar.js b/web/pdf_sidebar.js
@@ -156,7 +156,7 @@ class PDFSidebar {
    */
   switchView(view, forceOpen = false) {
     const isViewChanged = view !== this.active;
-    let shouldForceRendering = false;
+    let forceRendering = false;
 
     switch (view) {
       case SidebarView.NONE:
@@ -166,7 +166,7 @@ class PDFSidebar {
         return; // Closing will trigger rendering and dispatch the event.
       case SidebarView.THUMBS:
         if (this.isOpen && isViewChanged) {
-          shouldForceRendering = true;
+          forceRendering = true;
         }
         break;
       case SidebarView.OUTLINE:
@@ -224,9 +224,9 @@ class PDFSidebar {
       this.open();
       return; // Opening will trigger rendering and dispatch the event.
     }
-    if (shouldForceRendering) {
+    if (forceRendering) {
       this.#updateThumbnailViewer();
-      this.#forceRendering();
+      this.onToggled();
     }
     if (isViewChanged) {
       this.#dispatchEvent();
@@ -246,7 +246,7 @@ class PDFSidebar {
     if (this.active === SidebarView.THUMBS) {
       this.#updateThumbnailViewer();
     }
-    this.#forceRendering();
+    this.onToggled();
     this.#dispatchEvent();
 
     this.#hideUINotification();
@@ -263,7 +263,7 @@ class PDFSidebar {
     this.outerContainer.classList.add("sidebarMoving");
     this.outerContainer.classList.remove("sidebarOpen");
 
-    this.#forceRendering();
+    this.onToggled();
     this.#dispatchEvent();
   }
 
@@ -286,16 +286,6 @@ class PDFSidebar {
     });
   }
 
-  #forceRendering() {
-    if (this.onToggled) {
-      this.onToggled();
-    } else {
-      // Fallback
-      this.pdfViewer.forceRendering();
-      this.pdfThumbnailViewer.forceRendering();
-    }
-  }
-
   #updateThumbnailViewer() {
     const { pdfViewer, pdfThumbnailViewer } = this;