diff --git a/libs/hwui/ClipArea.cpp b/libs/hwui/ClipArea.cpp index 39b8d3de9c754..84451bacbc091 100644 --- a/libs/hwui/ClipArea.cpp +++ b/libs/hwui/ClipArea.cpp @@ -530,14 +530,14 @@ void ClipArea::applyClip(const ClipBase* clip, const Matrix4& transform) { } void ClipArea::applyTransformToRegion(const Matrix4& transform, SkRegion* region) { - if (transform.isSimple() && !transform.isPureTranslate()) { + if (transform.rectToRect() && !transform.isPureTranslate()) { // handle matrices with scale manually by mapping each rect SkRegion other; SkRegion::Iterator it(*region); while (!it.done()) { Rect rect(it.rect()); transform.mapRect(rect); - rect.roundOut(); + rect.snapGeometryToPixelBoundaries(true); other.op(rect.left, rect.top, rect.right, rect.bottom, SkRegion::kUnion_Op); it.next(); } diff --git a/libs/hwui/tests/unit/ClipAreaTests.cpp b/libs/hwui/tests/unit/ClipAreaTests.cpp index afabd359ed451..d4d7919f9eee4 100644 --- a/libs/hwui/tests/unit/ClipAreaTests.cpp +++ b/libs/hwui/tests/unit/ClipAreaTests.cpp @@ -334,5 +334,14 @@ TEST(ClipArea, applyTransformToRegion_translateScale) { EXPECT_EQ(SkIRect::MakeLTRB(12, 26, 16, 32), region.getBounds()); } +TEST(ClipArea, applyTransformToRegion_rotate90) { + SkRegion region(SkIRect::MakeLTRB(1, 2, 3, 4)); + Matrix4 transform; + transform.loadRotate(90); + ClipArea::applyTransformToRegion(transform, ®ion); + EXPECT_TRUE(region.isRect()); + EXPECT_EQ(SkIRect::MakeLTRB(-4, 1, -2, 3), region.getBounds()); +} + } // namespace uirenderer } // namespace android