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

Commit d3f9ffe2 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev

parents 5d1a182a ee5b2c6d

libs/hwui/DisplayListOp.h

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ public: 
    }



    bool mergeAllowed() {

        if (!state.mMatrix.isPureTranslate()) return false;



        // checks that we're unclipped, and srcover

        const Rect& opBounds = state.mBounds;

        return fabs(opBounds.getWidth() - mLocalBounds.getWidth()) < 0.1 &&