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

Jump to bottom

Fix or revert PR #12363 #12367

Closed
timvandermeij opened this issue Sep 12, 2020 · 7 comments · Fixed by #12368 or #12369
Closed

Fix or revert PR #12363 #12367

timvandermeij opened this issue Sep 12, 2020 · 7 comments · Fixed by #12368 or #12369
Labels
core

Comments

@timvandermeij
Copy link
Contributor

See #12363 (comment) for context. If we can easily fix this I'd prefer that, but otherwise we can revert it for now.

/cc @emilio
@Snuffleupagus
Copy link
Collaborator

Snuffleupagus commented Sep 12, 2020 •
edited
Loading

I'd suggest reverting the PR immediately, since it currently causes (viewer) errors and testing/makeref won't work correctly, and re-landing it later once it's been carefully tested/validated.

While it's probably simple to just hack-around the error, however the final patch ought to explain why (for this case) things broke such that we don't just introduce an error elsewhere; especially considering that the SMask handling isn't that simple/straightforward.

@emilio
Copy link
Contributor

emilio commented Sep 12, 2020

I have a fix, but I'm happy re-landing after revert if that's preferred.

emilio added a commit to emilio/pdf.js that referenced this issue Sep 12, 2020
@emilio
canvas: restore() should reflect that smask groups are finished when …
6bd6b8f 
…stateStack is empty.

This fixes mozilla#12367. When we end the SMask group and stateStack.length is zero,
nothing updates this.current to reflect it.
@Snuffleupagus Snuffleupagus mentioned this issue Sep 12, 2020
Merged
@emilio emilio mentioned this issue Sep 12, 2020
Merged
@emilio
Copy link
Contributor

emilio commented Sep 12, 2020

#12369 is the fix.

@emilio
Copy link
Contributor

emilio commented Sep 12, 2020

(And I think the fix is pretty safe, but again, more than happy to revert my original PR, then land the fix, then re-land my original PR).

@timvandermeij
Copy link
Contributor Author

In order to get master working again, we have reverted the original PR in #12368 now. For #12369 you can either include the original commit after the fix commit or squash them both into one commit since they are related and one doesn't work without the other.

emilio added a commit to emilio/pdf.js that referenced this issue Sep 12, 2020
@emilio
canvas: restore() should reflect that smask groups are finished when …
3fa1ce3 
…stateStack is empty.

This fixes mozilla#12367. When we end the SMask group and stateStack.length is zero,
nothing updates this.current to reflect it.
@emilio
Copy link
Contributor

emilio commented Sep 12, 2020

I've done the former, thanks, and sorry for the trouble!

emilio added a commit to emilio/pdf.js that referenced this issue Sep 12, 2020
@emilio
canvas: restore() should reflect that smask groups are finished when …
3a277f3 
…stateStack is empty.

This fixes the issue that caused mozilla#12363 to get reverted, see mozilla#12367.
When we end the SMask group and stateStack.length is zero, nothing updates
this.current to reflect it.
@timvandermeij
Copy link
Contributor Author

No worries!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
core
Projects
None yet
Milestone
No milestone
3 participants
@emilio @timvandermeij @Snuffleupagus