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

Commit 17917a95 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

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

* commit 'd3f9ffe2':
  Prevent transformed ops from merging in the first place
parents e3e55f2a d3f9ffe2

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 &&