Offload canvas drawing operations to a worker #20729
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -398,6 +398,121 @@ class PartialEvaluator { | |
| return false; | ||
| } | ||
|
|
||
| _hasTransferMaps(transferObj) { | ||
| let transferArray; | ||
| if (Array.isArray(transferObj)) { | ||
| transferArray = transferObj; | ||
| } else if (isPDFFunction(transferObj)) { | ||
| transferArray = [transferObj]; | ||
| } else { | ||
| return false; | ||
| } | ||
|
|
||
| const numFns = transferArray.length; | ||
| if (!(numFns === 1 || numFns === 4)) { | ||
| return false; | ||
| } | ||
|
|
||
| let numEffectfulFns = 0; | ||
| for (const entry of transferArray) { | ||
| const transfer = this.xref.fetchIfRef(entry); | ||
| if (isName(transfer, "Identity")) { | ||
| continue; | ||
| } | ||
| if (!isPDFFunction(transfer)) { | ||
| return false; | ||
| } | ||
| numEffectfulFns++; | ||
| } | ||
| return numEffectfulFns > 0; | ||
| } | ||
|
|
||
| hasCanvasFilters(resources) { | ||
| if (!(resources instanceof Dict)) { | ||
| return false; | ||
| } | ||
|
|
||
| const processed = new RefSet(); | ||
| if (resources.objId) { | ||
| processed.put(resources.objId); | ||
| } | ||
| const xref = this.xref; | ||
| const nodes = [resources]; | ||
| while (nodes.length) { | ||
| const node = nodes.shift(); | ||
|
|
||
| const graphicStates = node.get("ExtGState"); | ||
| if (graphicStates instanceof Dict) { | ||
| for (let graphicState of graphicStates.getRawValues()) { | ||
| if (graphicState instanceof Ref) { | ||
| if (processed.has(graphicState)) { | ||
| continue; | ||
| } | ||
| try { | ||
| graphicState = xref.fetch(graphicState); | ||
| } catch (ex) { | ||
| info(`hasCanvasFilters - failed to fetch ExtGState: "${ex}".`); | ||
| // A fetch failure means we can't inspect the resource, so fall | ||
| // back to main-thread rendering rather than misclassify a corrupt | ||
| // PDF as filter-free. | ||
| return true; | ||
| } | ||
| } | ||
| if (!(graphicState instanceof Dict)) { | ||
| continue; | ||
| } | ||
| if (graphicState.objId) { | ||
| processed.put(graphicState.objId); | ||
| } | ||
| try { | ||
| if (this._hasTransferMaps(graphicState.get("TR"))) { | ||
| return true; | ||
| } | ||
| } catch (ex) { | ||
| info(`hasCanvasFilters - failed to inspect filter data: "${ex}".`); | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| const xObjects = node.get("XObject"); | ||
|
Contributor
There was a problem hiding this comment. You only visit XObject but a TR/TR2 can be in a tiling pattern too. |
||
| if (xObjects instanceof Dict) { | ||
| for (let xObject of xObjects.getRawValues()) { | ||
| if (xObject instanceof Ref) { | ||
| if (processed.has(xObject)) { | ||
| continue; | ||
| } | ||
| try { | ||
| xObject = xref.fetch(xObject); | ||
| } catch (ex) { | ||
| info(`hasCanvasFilters - failed to fetch XObject: "${ex}".`); | ||
| return true; | ||
| } | ||
| } | ||
| if (!(xObject instanceof BaseStream)) { | ||
| continue; | ||
| } | ||
| if (xObject.dict.objId) { | ||
| processed.put(xObject.dict.objId); | ||
| } | ||
| const xResources = xObject.dict.get("Resources"); | ||
| if (!(xResources instanceof Dict)) { | ||
| continue; | ||
| } | ||
| if (xResources.objId && processed.has(xResources.objId)) { | ||
| continue; | ||
| } | ||
|
|
||
| nodes.push(xResources); | ||
| if (xResources.objId) { | ||
| processed.put(xResources.objId); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
Comment on lines
+445
to
+512
Contributor
There was a problem hiding this comment. The two loops look very similar, maybe we could have an helper function to avoid redundancy.
Collaborator
Author
There was a problem hiding this comment. I did try doing that, in one of the earlier versions of the patch, I think this is probably the commit which captures the idea, later though I felt it added too much complexity and reduced readability of the code without significant returns, so I isolated them, let me know if you prefer extracting the common bits though, it should be a minimal effort to go back to that approach |
||
| return false; | ||
| } | ||
|
|
||
| async fetchBuiltInCMap(name) { | ||
| const cachedData = this.builtInCMapCache.get(name); | ||
| if (cachedData) { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I recently added support for TR2 too