Fix crash from boxShadow conditional canvas.save()#45780
Closed
NickGerleman wants to merge 1 commit into
Closed
Conversation
Contributor
|
This pull request was exported from Phabricator. Differential Revision: D60375357 |
Summary: Pull Request resolved: facebook#45780 D59300215 noticed that the drawable was leaking a clipping rect for the rest of the operations, and added a `save/restore` pair, but the save happens conditionally, so we can restore more often than we save, if we hit a fast path of not needing to invalidate the shadow RenderNode when drawing. This leads to the following unhandled exception: ``` java.lang.IllegalStateException: Underflow in restore - more restores than saves at android.graphics.Canvas.restore(Canvas.java:647) at com.facebook.react.uimanager.drawable.OutsetBoxShadowDrawable.draw(OutsetBoxShadowDrawable.kt:110) at android.graphics.drawable.LayerDrawable.draw(LayerDrawable.java:1019) ``` This change moves saving canvas context to before setting state and drawing onto the canvas, instead of the area manipulating the RenderNode. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D60375357
Contributor
|
This pull request was exported from Phabricator. Differential Revision: D60375357 |
58e42c0 to
a2e81bd
Compare
Contributor
|
This pull request has been merged in 496e77b. |
Collaborator
|
This pull request was successfully merged by @NickGerleman in 496e77b When will my fix make it into a release? | How to file a pick request? |
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
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.
Summary:
D59300215 noticed that the drawable was leaking a clipping rect for the rest of the operations, and added a
save/restorepair, but the save happens conditionally, so we can restore more often than we save, if we hit a fast path of not needing to invalidate the shadow RenderNode when drawing. This leads to the following unhandled exception:This change moves saving canvas context to before setting state and drawing onto the canvas, instead of the area manipulating the RenderNode.
Changelog: [Internal]
Differential Revision: D60375357