diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractClippingDrawCommand.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractClippingDrawCommand.java index e3a4298d887..5e9dfba8b64 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractClippingDrawCommand.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractClippingDrawCommand.java @@ -62,8 +62,6 @@ import android.graphics.Canvas; // shows up during screenshot testing. Note that checking one side is enough, since if one side // is infinite, all sides will be infinite, since we only set infinite for all sides at the // same time - conversely, if one side is finite, all sides will be finite. - if (mNeedsClipping) { - canvas.clipRect(mClipLeft, mClipTop, mClipRight, mClipBottom); - } + canvas.clipRect(mClipLeft, mClipTop, mClipRight, mClipBottom); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java index 55b03c2d4ec..5c7196d079f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/AbstractDrawCommand.java @@ -31,7 +31,7 @@ import android.graphics.Canvas; public final void draw(FlatViewGroup parent, Canvas canvas) { onPreDraw(parent, canvas); if (shouldClip()) { - canvas.save(); + canvas.save(Canvas.CLIP_SAVE_FLAG); applyClipping(canvas); onDraw(canvas); canvas.restore(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java index 350506cd3bb..8d46dd049ca 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawView.java @@ -22,7 +22,7 @@ import android.graphics.Canvas; @Override public void draw(FlatViewGroup parent, Canvas canvas) { if (mNeedsClipping) { - canvas.save(); + canvas.save(Canvas.CLIP_SAVE_FLAG); applyClipping(canvas); parent.drawNextChild(canvas); canvas.restore(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java index 5f227d56832..df2e8cdd815 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatViewGroup.java @@ -346,7 +346,7 @@ import com.facebook.react.views.image.ImageLoadEvent; super.drawChild(canvas, child, getDrawingTime()); } else { // Make sure non-React Views clip properly. - canvas.save(); + canvas.save(Canvas.CLIP_SAVE_FLAG); child.getHitRect(VIEW_BOUNDS); canvas.clipRect(VIEW_BOUNDS); super.drawChild(canvas, child, getDrawingTime());