Skip to content

Fix crash from boxShadow conditional canvas.save() #45780

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

Closed
NickGerleman wants to merge 1 commit into from
Closed

Fix crash from boxShadow conditional canvas.save() #45780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions ...eactAndroid/src/main/java/com/facebook/react/uimanager/drawable/InsetBoxShadowDrawable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ internal class InsetBoxShadowDrawable(
clearRegionDrawable.layoutDirection != layoutDirection ||
clearRegionDrawable.borderRadius != clearRegionBorderRadii ||
clearRegionDrawable.bounds != clearRegionBounds) {
canvas.save()

shadowPaint.colorFilter = colorFilter
clearRegionDrawable.bounds = clearRegionBounds
Expand All @@ -100,22 +99,24 @@ internal class InsetBoxShadowDrawable(
// We pad by the blur radius so that the edges of the blur look good and
// the blur artifacts can bleed into the view if needed
setPosition(Rect(bounds).apply { inset(-padding, -padding) })
beginRecording().let { canvas ->
beginRecording().let { renderNodeCanvas ->
val borderBoxPath = clearRegionDrawable.getBorderBoxPath()
if (borderBoxPath != null) {
canvas.clipOutPath(borderBoxPath)
renderNodeCanvas.clipOutPath(borderBoxPath)
} else {
canvas.clipOutRect(clearRegionDrawable.borderBoxRect)
renderNodeCanvas.clipOutRect(clearRegionDrawable.borderBoxRect)
}

canvas.drawPaint(shadowPaint)
renderNodeCanvas.drawPaint(shadowPaint)
endRecording()
}
}

// We actually draw the render node into our canvas and clip out the
// padding
with(canvas) {
save()

val paddingBoxPath = background.getPaddingBoxPath()
if (paddingBoxPath != null) {
canvas.clipPath(paddingBoxPath)
Expand All @@ -125,9 +126,8 @@ internal class InsetBoxShadowDrawable(
// This positions the render node properly since we padded it
canvas.translate(padding / 2f, padding / 2f)
drawRenderNode(renderNode)
restore()
}

canvas.restore()
}
}

Expand Down
10 changes: 5 additions & 5 deletions ...actAndroid/src/main/java/com/facebook/react/uimanager/drawable/OutsetBoxShadowDrawable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ internal class OutsetBoxShadowDrawable(
shadowShapeDrawable.layoutDirection != layoutDirection ||
shadowShapeDrawable.borderRadius != borderRadii ||
shadowShapeDrawable.colorFilter != colorFilter) {
canvas.save()
shadowShapeDrawable.bounds = shadowShapeBounds
shadowShapeDrawable.layoutDirection = layoutDirection
shadowShapeDrawable.borderRadius = borderRadii
Expand All @@ -89,14 +88,16 @@ internal class OutsetBoxShadowDrawable(
PixelUtil.toPixelFromDIP(offsetY).roundToInt())
})

beginRecording().let { canvas ->
shadowShapeDrawable.draw(canvas)
beginRecording().let { renderNodeCanvas ->
shadowShapeDrawable.draw(renderNodeCanvas)
endRecording()
}
}
}

with(canvas) {
save()

val borderBoxPath = background.getBorderBoxPath()
if (borderBoxPath != null) {
clipOutPath(borderBoxPath)
Expand All @@ -105,8 +106,7 @@ internal class OutsetBoxShadowDrawable(
}

drawRenderNode(renderNode)
restore()
}

canvas.restore()
}
}