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

Merge \"Add missing roundOut for layer damage\" into nyc-dev

Browse Source 
am: 48cde353eb

Change-Id: If4ca933e218fc33fa78dc063b687e03793635e6c
This commit is contained in:
John Reck
2016-06-27 22:28:39 +00:00
committed by android-build-merger
parent 65c0d9d290 48cde353eb
commit aecf607eb6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hwui/LayerUpdateQueue.cpp
View File

@@ -26,6 +26,7 @@ void LayerUpdateQueue::clear() {
} }
void LayerUpdateQueue::enqueueLayerWithDamage(RenderNode* renderNode, Rect damage) { void LayerUpdateQueue::enqueueLayerWithDamage(RenderNode* renderNode, Rect damage) {
damage.roundOut();
damage.doIntersect(0, 0, renderNode->getWidth(), renderNode->getHeight()); damage.doIntersect(0, 0, renderNode->getWidth(), renderNode->getHeight());
if (!damage.isEmpty()) { if (!damage.isEmpty()) {
for (Entry& entry : mEntries) { for (Entry& entry : mEntries) {

6
libs/hwui/tests/unit/LayerUpdateQueueTests.cpp
View File

@@ -39,17 +39,21 @@ static sp<RenderNode> createSyncedNode(uint32_t width, uint32_t height) {
TEST(LayerUpdateQueue, enqueueSimple) { TEST(LayerUpdateQueue, enqueueSimple) {
sp<RenderNode> a = createSyncedNode(100, 100); sp<RenderNode> a = createSyncedNode(100, 100);
sp<RenderNode> b = createSyncedNode(200, 200); sp<RenderNode> b = createSyncedNode(200, 200);
sp<RenderNode> c = createSyncedNode(200, 200);
LayerUpdateQueue queue; LayerUpdateQueue queue;
queue.enqueueLayerWithDamage(a.get(), Rect(25, 25, 75, 75)); queue.enqueueLayerWithDamage(a.get(), Rect(25, 25, 75, 75));
queue.enqueueLayerWithDamage(b.get(), Rect(100, 100, 300, 300)); 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(a.get(), queue.entries()[0].renderNode);
EXPECT_EQ(Rect(25, 25, 75, 75), queue.entries()[0].damage); EXPECT_EQ(Rect(25, 25, 75, 75), queue.entries()[0].damage);
EXPECT_EQ(b.get(), queue.entries()[1].renderNode); EXPECT_EQ(b.get(), queue.entries()[1].renderNode);
EXPECT_EQ(Rect(100, 100, 200, 200), queue.entries()[1].damage); // clipped to bounds 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) { TEST(LayerUpdateQueue, enqueueUnion) {