Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the dependencies property, on OperatorList instances, from an Object to a Set #11993

Merged
merged 2 commits into from
Jun 11, 2020
Merged

Change the dependencies property, on OperatorList instances, from an Object to a Set #11993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02a1d0f
Remove the unused `intent`/`pageIndex` properties from `OperatorList`…
Snuffleupagus Jun 11, 2020
10f31bb
Change the `dependencies` property, on `OperatorList` instances, from…
Snuffleupagus Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
20 changes: 10 additions & 10 deletions src/core/operator_list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand All @@ -618,10 +618,8 @@ var OperatorList = (function OperatorListClosure() {
} else {
this.optimizer = new NullOptimizer(this);
}
this.dependencies = Object.create(null);
this.dependencies = new Set();
this._totalLength = 0;
this.pageIndex = pageIndex;
this.intent = intent;
this.weight = 0;
this._resolved = streamSink ? null : Promise.resolve();
}
Expand Down Expand Up @@ -660,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);
}
},

Expand All @@ -678,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]);
}
Expand Down Expand Up @@ -736,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;
Expand Down