Merge pull request #16032 from Snuffleupagus/less-arrayByteLength

Reduce usage of the `arrayByteLength` helper function
mozilla · Feb 9, 2023 · 1fc8350 · 1fc8350
2 parents 972744a + 96d338e
commit 1fc8350
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 17 deletions.
diff --git a/src/core/chunked_stream.js b/src/core/chunked_stream.js
@@ -14,8 +14,8 @@
  */
 
 import {
-  arrayByteLength,
   arraysToBytes,
+  assert,
   createPromiseCapability,
 } from "../shared/util.js";
 import { MissingDataException } from "./core_utils.js";
@@ -291,21 +291,31 @@ class ChunkedStreamManager {
     let chunks = [],
       loaded = 0;
     return new Promise((resolve, reject) => {
-      const readChunk = chunk => {
+      const readChunk = ({ value, done }) => {
         try {
-          if (!chunk.done) {
-            const data = chunk.value;
-            chunks.push(data);
-            loaded += arrayByteLength(data);
-            if (rangeReader.isStreamingSupported) {
-              this.onProgress({ loaded });
-            }
-            rangeReader.read().then(readChunk, reject);
+          if (done) {
+            const chunkData = arraysToBytes(chunks);
+            chunks = null;
+            resolve(chunkData);
             return;
           }
-          const chunkData = arraysToBytes(chunks);
-          chunks = null;
-          resolve(chunkData);
+          if (
+            typeof PDFJSDev === "undefined" ||
+            PDFJSDev.test("!PRODUCTION || TESTING")
+          ) {
+            assert(
+              value instanceof ArrayBuffer,
+              "readChunk (sendRequest) - expected an ArrayBuffer."
+            );
+          }
+          loaded += value.byteLength;
+
+          if (rangeReader.isStreamingSupported) {
+            this.onProgress({ loaded });
+          }
+
+          chunks.push(value);
+          rangeReader.read().then(readChunk, reject);
         } catch (e) {
           reject(e);
         }

diff --git a/src/core/worker.js b/src/core/worker.js
@@ -15,8 +15,8 @@
 
 import {
   AbortException,
-  arrayByteLength,
   arraysToBytes,
+  assert,
   createPromiseCapability,
   getVerbosityLevel,
   info,
@@ -314,8 +314,17 @@ class WorkerMessageHandler {
               cancelXHRs = null;
               return;
             }
+            if (
+              typeof PDFJSDev === "undefined" ||
+              PDFJSDev.test("!PRODUCTION || TESTING")
+            ) {
+              assert(
+                value instanceof ArrayBuffer,
+                "readChunk (getPdfManager) - expected an ArrayBuffer."
+              );
+            }
+            loaded += value.byteLength;
 
-            loaded += arrayByteLength(value);
             if (!fullRequest.isStreamingSupported) {
               handler.send("DocProgress", {
                 loaded,
@@ -328,7 +337,6 @@ class WorkerMessageHandler {
             } else {
               cachedChunks.push(value);
             }
-
             fullRequest.read().then(readChunk, reject);
           } catch (e) {
             reject(e);

diff --git a/src/shared/util.js b/src/shared/util.js
@@ -1115,7 +1115,6 @@ export {
   AnnotationReviewState,
   AnnotationStateModelType,
   AnnotationType,
-  arrayByteLength,
   arraysToBytes,
   assert,
   BaseException,