Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid returning mutable Path in CSSBackgroundDrawable (#44733)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/44733

We are returning a Path to callers, which shouldn't be mutated. This isn't really safe. Return a copy to external callers instead, if they need a path to work with.

Changelog: [Internal]

Reviewed By: rshest

Differential Revision: D57996157

fbshipit-source-id: 53cd95df6e2641d946f7c3fef40f6449b16ca5cb
This commit is contained in:
Nick Gerleman
2024-05-31 12:06:33 -07:00
committed by Facebook GitHub Bot
parent 869eebe02d
commit a1f68dbfb4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CSSBackgroundDrawable.java
+5 -4
View File
@@ -319,7 +319,7 @@ public class CSSBackgroundDrawable extends Drawable {
public @Nullable Path getBorderBoxPath() {
if (hasRoundedBorders()) {
updatePath();
return Preconditions.checkNotNull(mOuterClipPathForBorderRadius);
return new Path(Preconditions.checkNotNull(mOuterClipPathForBorderRadius));
}
return null;
@@ -332,7 +332,7 @@ public class CSSBackgroundDrawable extends Drawable {
public @Nullable Path getPaddingBoxPath() {
if (hasRoundedBorders()) {
updatePath();
return Preconditions.checkNotNull(mInnerClipPathForBorderRadius);
return new Path(Preconditions.checkNotNull(mInnerClipPathForBorderRadius));
}
return null;
@@ -356,7 +356,7 @@ public class CSSBackgroundDrawable extends Drawable {
canvas.save();
// Clip outer border
canvas.clipPath(Preconditions.checkNotNull(getBorderBoxPath()), Region.Op.INTERSECT);
canvas.clipPath(Preconditions.checkNotNull(mOuterClipPathForBorderRadius), Region.Op.INTERSECT);
// Draws the View without its border first (with background color fill)
int useColor = ColorUtils.setAlphaComponent(mColor, getOpacity());
@@ -415,7 +415,8 @@ public class CSSBackgroundDrawable extends Drawable {
mPaint.setStyle(Paint.Style.FILL);
// Clip inner border
canvas.clipPath(Preconditions.checkNotNull(getPaddingBoxPath()), Region.Op.DIFFERENCE);
canvas.clipPath(
Preconditions.checkNotNull(mInnerClipPathForBorderRadius), Region.Op.DIFFERENCE);
final boolean isRTL = getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
int colorStart = getBorderColor(Spacing.START);