Improve the Pattern-detection in CanvasGraphics.stroke
#12591
Merged
Conversation
This file contains 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
The vast majority of the time, unless a Pattern is active, the `strokeColor`-property contains a "simple" colour value represented by a String. Hence it seems somewhat ridiculous to do a `hasOwnProperty` check on a String, and it's should thus be possible to improve things a tiny bit here. Unfortunately using a simple `instanceof` check would only work for `TilingPattern`s, but not for the `ShadingIRs` given how they are implemented; see `src/display/pattern_helper.js`. (While that file could probably do with some clean-up, given the age of some of its code, that probably shouldn't happen here.) Finally, the `this.type = "Pattern"`-property of the various Shadings/TilingPatterns were removed, since I cannot see why it's necessary when we can simply check for a `getPattern` method instead. Note that part of this code even pre-dates the main/worker-thread split, which probably in part explains why it looks the way it does.
Snuffleupagus
commented
Nov 6, 2020
|
/botio test |
From: Bot.io (Linux m4)ReceivedCommand cmd_test from @Snuffleupagus received. Current queue size: 0 Live output at: http://54.67.70.0:8877/8abb60f67a7260c/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_test from @Snuffleupagus received. Current queue size: 0 Live output at: http://3.101.106.178:8877/d88eca80a52c05f/output.txt |
From: Bot.io (Linux m4)FailedFull output at http://54.67.70.0:8877/8abb60f67a7260c/output.txt Total script time: 25.06 mins
Image differences available at: http://54.67.70.0:8877/8abb60f67a7260c/reftest-analyzer.html#web=eq.log |
From: Bot.io (Windows)FailedFull output at http://3.101.106.178:8877/d88eca80a52c05f/output.txt Total script time: 28.46 mins
Image differences available at: http://3.101.106.178:8877/d88eca80a52c05f/reftest-analyzer.html#web=eq.log |
timvandermeij
approved these changes
Nov 6, 2020
|
Thank you for simplifying this a bit! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The vast majority of the time, unless a Pattern is active, the
strokeColor-property contains a "simple" colour value represented by a String. Hence it seems somewhat ridiculous to do ahasOwnPropertycheck on a String, and it's should thus be possible to improve things a tiny bit here.Unfortunately using a simple
instanceofcheck would only work forTilingPatterns, but not for theShadingIRsgiven how they are implemented; seesrc/display/pattern_helper.js. (While that file could probably do with some clean-up, given the age of some of its code, that probably shouldn't happen here.)Finally, the
this.type = "Pattern"-property of the various Shadings/TilingPatterns were removed, since I cannot see why it's necessary when we can simply check for agetPatternmethod instead. Note that part of this code even pre-dates the main/worker-thread split, which probably in part explains why it looks the way it does.