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

Commit cd55eae6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use correct state when calling getZ"

parents efc9eec7 301b1d84

services/surfaceflinger/Layer.cpp

+7 −5
Original line number Original line Diff line number Diff line
@@ -1540,8 +1540,10 @@ void Layer::setParent(const sp<Layer>& layer) { 
    mCurrentParent = layer;

    mCurrentParent = layer;

}

}





int32_t Layer::getZ() const {

int32_t Layer::getZ(LayerVector::StateSet stateSet) const {

    return mDrawingState.z;

    const bool useDrawing = stateSet == LayerVector::StateSet::Drawing;

    const State& state = useDrawing ? mDrawingState : mCurrentState;

    return state.z;

}

}





bool Layer::usingRelativeZ(LayerVector::StateSet stateSet) const {

bool Layer::usingRelativeZ(LayerVector::StateSet stateSet) const {
@@ -1601,7 +1603,7 @@ void Layer::traverseInZOrder(LayerVector::StateSet stateSet, const LayerVector:: 
            continue;

            continue;

        }

        }





        if (relative->getZ() >= 0) {

        if (relative->getZ(stateSet) >= 0) {

            break;

            break;

        }

        }

        relative->traverseInZOrder(stateSet, visitor);

        relative->traverseInZOrder(stateSet, visitor);
@@ -1635,7 +1637,7 @@ void Layer::traverseInReverseZOrder(LayerVector::StateSet stateSet, 
            continue;

            continue;

        }

        }





        if (relative->getZ() < 0) {

        if (relative->getZ(stateSet) < 0) {

            break;

            break;

        }

        }

        relative->traverseInReverseZOrder(stateSet, visitor);

        relative->traverseInReverseZOrder(stateSet, visitor);
@@ -1693,7 +1695,7 @@ void Layer::traverseChildrenInZOrderInner(const std::vector<Layer*>& layersInTre 
    size_t i = 0;

    size_t i = 0;

    for (; i < list.size(); i++) {

    for (; i < list.size(); i++) {

        const auto& relative = list[i];

        const auto& relative = list[i];

        if (relative->getZ() >= 0) {

        if (relative->getZ(stateSet) >= 0) {

            break;

            break;

        }

        }

        relative->traverseChildrenInZOrderInner(layersInTree, stateSet, visitor);

        relative->traverseChildrenInZOrderInner(layersInTree, stateSet, visitor);

services/surfaceflinger/Layer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -672,7 +672,7 @@ public: 
    // Copy the current list of children to the drawing state. Called by

    // Copy the current list of children to the drawing state. Called by

    // SurfaceFlinger to complete a transaction.

    // SurfaceFlinger to complete a transaction.

    void commitChildList();

    void commitChildList();

    int32_t getZ() const;

    int32_t getZ(LayerVector::StateSet stateSet) const;

    virtual void pushPendingState();

    virtual void pushPendingState();





    /**

    /**