Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Fix rotated clip regions\" into nyc-mr1-dev

Browse Source 
am: 06f13cba5f

Change-Id: I4afab3a863f1f873e9dd95ed671072874a6a4511
This commit is contained in:
Chris Craik
2016-07-15 00:08:45 +00:00
committed by android-build-merger
parent ba350f3512 06f13cba5f
commit d5cdbdeae1
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/ClipArea.cpp
View File

@@ -530,14 +530,14 @@ void ClipArea::applyClip(const ClipBase* clip, const Matrix4& transform) {
} }
void ClipArea::applyTransformToRegion(const Matrix4& transform, SkRegion* region) { 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 // handle matrices with scale manually by mapping each rect
SkRegion other; SkRegion other;
SkRegion::Iterator it(*region); SkRegion::Iterator it(*region);
while (!it.done()) { while (!it.done()) {
Rect rect(it.rect()); Rect rect(it.rect());
transform.mapRect(rect); transform.mapRect(rect);
rect.roundOut(); rect.snapGeometryToPixelBoundaries(true);
other.op(rect.left, rect.top, rect.right, rect.bottom, SkRegion::kUnion_Op); other.op(rect.left, rect.top, rect.right, rect.bottom, SkRegion::kUnion_Op);
it.next(); it.next();
} }

9
libs/hwui/tests/unit/ClipAreaTests.cpp
View File

@@ -334,5 +334,14 @@ TEST(ClipArea, applyTransformToRegion_translateScale) {
EXPECT_EQ(SkIRect::MakeLTRB(12, 26, 16, 32), region.getBounds()); 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, &region);
EXPECT_TRUE(region.isRect());
EXPECT_EQ(SkIRect::MakeLTRB(-4, 1, -2, 3), region.getBounds());
}
} // namespace uirenderer } // namespace uirenderer
} // namespace android } // namespace android