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

Commit 2521e6df authored by Nader Jawad's avatar Nader Jawad Committed by Automerger Merge Worker
Browse files

Merge "Reduce some redundant steps" into main am: 2458071b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2950305



Change-Id: I7e06b809ba2fd950506d87437f52a3788a9ea84d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69a65985 2458071b

libs/hwui/DamageAccumulator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ void DamageAccumulator::applyRenderNodeTransform(DirtyStack* frame) { 
    }



    // Perform clipping

    if (props.getClipDamageToBounds() && !frame->pendingDirty.isEmpty()) {

    if (props.getClipDamageToBounds()) {

        if (!frame->pendingDirty.intersect(SkRect::MakeIWH(props.getWidth(), props.getHeight()))) {

            frame->pendingDirty.setEmpty();

        }

libs/hwui/renderthread/CanvasContext.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1067,6 +1067,7 @@ SkRect CanvasContext::computeDirtyRect(const Frame& frame, SkRect* dirty) { 


    if (dirty->isEmpty()) {

        dirty->setIWH(frame.width(), frame.height());

        return *dirty;

    }



    // At this point dirty is the area of the window to update. However,