[pull] master from mozilla:master

l10n/en-US/viewer.ftl

@@ -779,3 +779,7 @@ pdfjs-views-manager-paste-button-before =
 #   $page (Number) - the page number after which the paste button is.
 pdfjs-views-manager-paste-button-after =
     .title = Paste after page { $page }
+
+# Badge used to promote a new feature in the UI, keep it as short as possible.
+# It's spelled uppercase for English, but it can be translated as usual.
+pdfjs-new-badge-content = NEW

src/core/primitives.js

@@ -84,84 +84,47 @@ class Dict {
     return this._map.size;
   }
 
-  // Automatically dereferences Ref objects.
-  get(key1, key2, key3) {
+  #getValue(isAsync, key1, key2, key3) {
     let value = this._map.get(key1);
     if (value === undefined && key2 !== undefined) {
       if (
         (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) &&
         key2.length < key1.length
       ) {
-        unreachable("Dict.get: Expected keys to be ordered by length.");
+        unreachable("Dict.#getValue: Expected keys to be ordered by length.");
       }
       value = this._map.get(key2);
       if (value === undefined && key3 !== undefined) {
         if (
           (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) &&
           key3.length < key2.length
         ) {
-          unreachable("Dict.get: Expected keys to be ordered by length.");
+          unreachable("Dict.#getValue: Expected keys to be ordered by length.");
         }
         value = this._map.get(key3);
       }
     }
     if (value instanceof Ref && this.xref) {
-      return this.xref.fetch(value, this.suppressEncryption);
+      return isAsync
+        ? this.xref.fetchAsync(value, this.suppressEncryption)
+        : this.xref.fetch(value, this.suppressEncryption);
     }
     return value;
   }
 
+  // Automatically dereferences Ref objects.
+  get(key1, key2, key3) {
+    return this.#getValue(/* isAsync = */ false, key1, key2, key3);
+  }
+
   // Same as get(), but returns a promise and uses fetchIfRefAsync().
   async getAsync(key1, key2, key3) {
-    let value = this._map.get(key1);
-    if (value === undefined && key2 !== undefined) {
-      if (
-        (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) &&
-        key2.length < key1.length
-      ) {
-        unreachable("Dict.getAsync: Expected keys to be ordered by length.");
-      }
-      value = this._map.get(key2);
-      if (value === undefined && key3 !== undefined) {
-        if (
-          (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) &&
-          key3.length < key2.length
-        ) {
-          unreachable("Dict.getAsync: Expected keys to be ordered by length.");
-        }
-        value = this._map.get(key3);
-      }
-    }
-    if (value instanceof Ref && this.xref) {
-      return this.xref.fetchAsync(value, this.suppressEncryption);
-    }
-    return value;
+    return this.#getValue(/* isAsync = */ true, key1, key2, key3);
   }
 
   // Same as get(), but dereferences all elements if the result is an Array.
   getArray(key1, key2, key3) {
-    let value = this._map.get(key1);
-    if (value === undefined && key2 !== undefined) {
-      if (
-        (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) &&
-        key2.length < key1.length
-      ) {
-        unreachable("Dict.getArray: Expected keys to be ordered by length.");
-      }
-      value = this._map.get(key2);
-      if (value === undefined && key3 !== undefined) {
-        if (
-          (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) &&
-          key3.length < key2.length
-        ) {
-          unreachable("Dict.getArray: Expected keys to be ordered by length.");
-        }
-        value = this._map.get(key3);
-      }
-    }
-    if (value instanceof Ref && this.xref) {
-      value = this.xref.fetch(value, this.suppressEncryption);
-    }
+    let value = this.#getValue(/* isAsync = */ false, key1, key2, key3);
 
     if (Array.isArray(value)) {
       value = value.slice(); // Ensure that we don't modify the Dict data.

src/display/api.js

@@ -1363,6 +1363,19 @@ class PDFPageProxy {
     this.imageCoordinates = null;
   }
 
+  clone(id) {
+    const clone = new PDFPageProxy(
+      id,
+      this._pageInfo,
+      this._transport,
+      this.#pagesMapper,
+      this._pdfBug
+    );
+    clone.clonedFromIndex = this.clonedFromIndex ?? this._pageIndex;
+    this._transport.updatePage(clone);
+    return clone;
+  }
+
   /**
    * @type {number} Page number of the page. First page is 1.
    */
@@ -1375,6 +1388,7 @@ class PDFPageProxy {
    */
   set pageNumber(value) {
     this._pageIndex = value - 1;
+    this._transport.updatePage(this);
   }
 
   /**
@@ -2431,10 +2445,6 @@ class WorkerTransport {
 
   #passwordCapability = null;
 
-  #copiedPageInfo = null;
-
-  #savedPageInfo = null;
-
   constructor(
     messageHandler,
     loadingTask,
@@ -2468,7 +2478,6 @@ class WorkerTransport {
     this.setupMessageHandler();
 
     this.pagesMapper = pagesMapper;
-    this.pagesMapper.addListener(this.#updateCaches.bind(this));
 
     if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) {
       // For testing purposes.
@@ -2494,76 +2503,10 @@ class WorkerTransport {
     }
   }
 
-  #updateCaches({ type, pageNumbers }) {
-    if (type === "copy") {
-      this.#copiedPageInfo = new Map();
-      for (const pageNum of pageNumbers) {
-        this.#copiedPageInfo.set(pageNum, {
-          proxy: this.#pageCache.get(pageNum - 1) || null,
-          promise: this.#pagePromises.get(pageNum - 1) || null,
-        });
-      }
-      return;
-    }
-
-    if (type === "cancelCopy") {
-      this.#copiedPageInfo = null;
-      return;
-    }
-
-    if (type === "delete") {
-      this.#savedPageInfo = {
-        pageCache: new Map(this.#pageCache),
-        pagePromises: new Map(this.#pagePromises),
-      };
-      for (const pageNum of pageNumbers) {
-        this.#pageCache.delete(pageNum - 1);
-        this.#pagePromises.delete(pageNum - 1);
-      }
-    }
-
-    if (type === "cancelDelete") {
-      if (this.#savedPageInfo) {
-        this.#pageCache = this.#savedPageInfo.pageCache;
-        this.#pagePromises = this.#savedPageInfo.pagePromises;
-        this.#savedPageInfo = null;
-      }
-      return;
-    }
-
-    if (type === "cleanSavedData") {
-      this.#savedPageInfo = null;
-      return;
-    }
-
-    const newPageCache = new Map();
-    const newPromiseCache = new Map();
-    const { pagesMapper } = this;
-    for (let i = 0, ii = pagesMapper.pagesNumber; i < ii; i++) {
-      const prevPageNumber = pagesMapper.getPrevPageNumber(i + 1);
-      if (prevPageNumber < 0) {
-        const { proxy, promise } =
-          this.#copiedPageInfo?.get(-prevPageNumber) || {};
-        if (proxy) {
-          newPageCache.set(i, proxy);
-        }
-        if (promise) {
-          newPromiseCache.set(i, promise);
-        }
-        continue;
-      }
-      const prevPageIndex = prevPageNumber - 1;
-      const page = this.#pageCache.get(prevPageIndex);
-      if (page) {
-        newPageCache.set(i, page);
-      }
-      const promise = this.#pagePromises.get(prevPageIndex);
-      if (promise) {
-        newPromiseCache.set(i, promise);
-      }
-    }
-    this.#pageCache = newPageCache;
-    this.#pagePromises = newPromiseCache;
+  updatePage(page) {
+    const { _pageIndex } = page;
+    this.#pageCache.set(_pageIndex, page);
+    this.#pagePromises.set(_pageIndex, Promise.resolve(page));
   }
 
   #cacheSimpleMethod(name, data = null) {