Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5934c292 authored by radhakrishna's avatar radhakrishna Committed by Steve Kondik
Browse files

SF: Fix invalid reduction of transparent region from a layer. 

Reduce transparent region from a layer only if the transparent
region has valid intersection with the layer. Otherwise, reducing
a transparent region lying completely outside of the layer leads to
invalid sourcecrop values for the layer.

Change-Id: Iee9ba53a8072c21c9ba8a6d58cb14ca30f8600ba
CRs-Fixed: 620973
parent bea57f31

services/surfaceflinger/Layer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -326,7 +326,9 @@ Rect Layer::reduce(const Rect& win, const Region& exclude) const{ 
    if (CC_LIKELY(exclude.isEmpty())) {

        return win;

    }

    if (exclude.isRect()) {

    Rect tmp;

    win.intersect(exclude.getBounds(), &tmp);

    if (exclude.isRect() && !tmp.isEmpty()) {

        return win.reduce(exclude.getBounds());

    }

    return Region(win).subtract(exclude).getBounds();