From 02a1d0f6c577f932624cc09de863cd52aca6236c Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Thu, 11 Jun 2020 16:05:38 +0200
Subject: [PATCH 1/2] Remove the unused `intent`/`pageIndex` properties from
 `OperatorList` instances (PR 11069 follow-up)

Apparently I completely overlooked the fact that with the changes in PR 11069 these properties became *completely* unused, and consequently they thus ought to be removed.
---
 src/core/document.js      | 2 +-
 src/core/operator_list.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/core/document.js b/src/core/document.js
index 1c7772936dd78..dd456bbfd96ce 100644
--- a/src/core/document.js
+++ b/src/core/document.js
@@ -270,7 +270,7 @@ class Page {
 
     const dataPromises = Promise.all([contentStreamPromise, resourcesPromise]);
     const pageListPromise = dataPromises.then(([contentStream]) => {
-      const opList = new OperatorList(intent, sink, this.pageIndex);
+      const opList = new OperatorList(intent, sink);
 
       handler.send("StartRenderPage", {
         transparency: partialEvaluator.hasBlendModes(this.resources),
diff --git a/src/core/operator_list.js b/src/core/operator_list.js
index 0ae08bba5253d..f411c8653fdde 100644
--- a/src/core/operator_list.js
+++ b/src/core/operator_list.js
@@ -609,7 +609,7 @@ var OperatorList = (function OperatorListClosure() {
   var CHUNK_SIZE_ABOUT = CHUNK_SIZE - 5; // close to chunk size
 
   // eslint-disable-next-line no-shadow
-  function OperatorList(intent, streamSink, pageIndex) {
+  function OperatorList(intent, streamSink) {
     this._streamSink = streamSink;
     this.fnArray = [];
     this.argsArray = [];
@@ -620,8 +620,6 @@ var OperatorList = (function OperatorListClosure() {
     }
     this.dependencies = Object.create(null);
     this._totalLength = 0;
-    this.pageIndex = pageIndex;
-    this.intent = intent;
     this.weight = 0;
     this._resolved = streamSink ? null : Promise.resolve();
   }

From 10f31bb46d8e6e4504e8c9ebde576dff3fc834fa Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Thu, 11 Jun 2020 16:26:24 +0200
Subject: [PATCH 2/2] Change the `dependencies` property, on `OperatorList`
 instances, from an Object to a Set

Since this is completely internal functionality, and furthermore limited to the worker-thread, this change should thus not have any observable effect for e.g. an API-user.
---
 src/core/operator_list.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/core/operator_list.js b/src/core/operator_list.js
index f411c8653fdde..b3b9c045c1be5 100644
--- a/src/core/operator_list.js
+++ b/src/core/operator_list.js
@@ -618,7 +618,7 @@ var OperatorList = (function OperatorListClosure() {
     } else {
       this.optimizer = new NullOptimizer(this);
     }
-    this.dependencies = Object.create(null);
+    this.dependencies = new Set();
     this._totalLength = 0;
     this.weight = 0;
     this._resolved = streamSink ? null : Promise.resolve();
@@ -658,16 +658,16 @@ var OperatorList = (function OperatorListClosure() {
     },
 
     addDependency(dependency) {
-      if (dependency in this.dependencies) {
+      if (this.dependencies.has(dependency)) {
         return;
       }
-      this.dependencies[dependency] = true;
+      this.dependencies.add(dependency);
       this.addOp(OPS.dependency, [dependency]);
     },
 
     addDependencies(dependencies) {
-      for (var key in dependencies) {
-        this.addDependency(key);
+      for (const dependency of dependencies) {
+        this.addDependency(dependency);
       }
     },
 
@@ -676,7 +676,9 @@ var OperatorList = (function OperatorListClosure() {
         warn('addOpList - ignoring invalid "opList" parameter.');
         return;
       }
-      Object.assign(this.dependencies, opList.dependencies);
+      for (const dependency of opList.dependencies) {
+        this.dependencies.add(dependency);
+      }
       for (var i = 0, ii = opList.length; i < ii; i++) {
         this.addOp(opList.fnArray[i], opList.argsArray[i]);
       }
@@ -734,7 +736,7 @@ var OperatorList = (function OperatorListClosure() {
         this._transfers
       );
 
-      this.dependencies = Object.create(null);
+      this.dependencies.clear();
       this.fnArray.length = 0;
       this.argsArray.length = 0;
       this.weight = 0;