From ac046387be01e586ab29519adb6d865381efa37f Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 27 Jun 2016 15:13:54 -0700 Subject: [PATCH] Add missing roundOut for layer damage fixes: 29771171 This is a regression from HWUI_NEW_OPS, a roundOut was missing in the new path that was in the old one Change-Id: Ibf223d550bb5525781864dd9b7f7cd6d73adb98b --- libs/hwui/LayerUpdateQueue.cpp | 1 + libs/hwui/tests/unit/LayerUpdateQueueTests.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/hwui/LayerUpdateQueue.cpp b/libs/hwui/LayerUpdateQueue.cpp index db5f676d09dce..95f5cfb33474b 100644 --- a/libs/hwui/LayerUpdateQueue.cpp +++ b/libs/hwui/LayerUpdateQueue.cpp @@ -26,6 +26,7 @@ void LayerUpdateQueue::clear() { } void LayerUpdateQueue::enqueueLayerWithDamage(RenderNode* renderNode, Rect damage) { + damage.roundOut(); damage.doIntersect(0, 0, renderNode->getWidth(), renderNode->getHeight()); if (!damage.isEmpty()) { for (Entry& entry : mEntries) { diff --git a/libs/hwui/tests/unit/LayerUpdateQueueTests.cpp b/libs/hwui/tests/unit/LayerUpdateQueueTests.cpp index 8b0e91c773968..4db1cb935902a 100644 --- a/libs/hwui/tests/unit/LayerUpdateQueueTests.cpp +++ b/libs/hwui/tests/unit/LayerUpdateQueueTests.cpp @@ -39,17 +39,21 @@ static sp createSyncedNode(uint32_t width, uint32_t height) { TEST(LayerUpdateQueue, enqueueSimple) { sp a = createSyncedNode(100, 100); sp b = createSyncedNode(200, 200); + sp c = createSyncedNode(200, 200); LayerUpdateQueue queue; queue.enqueueLayerWithDamage(a.get(), Rect(25, 25, 75, 75)); queue.enqueueLayerWithDamage(b.get(), Rect(100, 100, 300, 300)); + queue.enqueueLayerWithDamage(c.get(), Rect(.5, .5, .5, .5)); - EXPECT_EQ(2u, queue.entries().size()); + EXPECT_EQ(3u, queue.entries().size()); EXPECT_EQ(a.get(), queue.entries()[0].renderNode); EXPECT_EQ(Rect(25, 25, 75, 75), queue.entries()[0].damage); EXPECT_EQ(b.get(), queue.entries()[1].renderNode); EXPECT_EQ(Rect(100, 100, 200, 200), queue.entries()[1].damage); // clipped to bounds + EXPECT_EQ(c.get(), queue.entries()[2].renderNode); + EXPECT_EQ(Rect(0, 0, 1, 1), queue.entries()[2].damage); // rounded out } TEST(LayerUpdateQueue, enqueueUnion) {