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

Commit 3c9edc9f authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Cleanup unused param in RenderNode::computeOrdering"

parents b1870e92 f293259c

libs/hwui/RenderNode.cpp

+2 −8
Original line number Diff line number Diff line
@@ -513,14 +513,12 @@ void RenderNode::computeOrdering() { 
    if (mDisplayListData == nullptr) return;

    for (unsigned int i = 0; i < mDisplayListData->children().size(); i++) {

        DrawRenderNodeOp* childOp = mDisplayListData->children()[i];

        childOp->mRenderNode->computeOrderingImpl(childOp,

                properties().getOutline().getPath(), &mProjectedNodes, &mat4::identity());

        childOp->mRenderNode->computeOrderingImpl(childOp, &mProjectedNodes, &mat4::identity());

    }

}



void RenderNode::computeOrderingImpl(

        DrawRenderNodeOp* opState,

        const SkPath* outlineOfProjectionSurface,

        std::vector<DrawRenderNodeOp*>* compositedChildrenOfProjectionSurface,

        const mat4* transformFromProjectionSurface) {

    mProjectedNodes.clear();
@@ -548,7 +546,6 @@ void RenderNode::computeOrderingImpl( 
            DrawRenderNodeOp* childOp = mDisplayListData->children()[i];

            RenderNode* child = childOp->mRenderNode;



            const SkPath* projectionOutline = nullptr;

            std::vector<DrawRenderNodeOp*>* projectionChildren = nullptr;

            const mat4* projectionTransform = nullptr;

            if (isProjectionReceiver && !child->properties().getProjectBackwards()) {
@@ -557,7 +554,6 @@ void RenderNode::computeOrderingImpl( 
                // Note that if a direct descendant is projecting backwards, we pass its

                // grandparent projection collection, since it shouldn't project onto its

                // parent, where it will already be drawing.

                projectionOutline = properties().getOutline().getPath();

                projectionChildren = &mProjectedNodes;

                projectionTransform = &mat4::identity();

            } else {
@@ -565,12 +561,10 @@ void RenderNode::computeOrderingImpl( 
                    applyViewPropertyTransforms(localTransformFromProjectionSurface);

                    haveAppliedPropertiesToProjection = true;

                }

                projectionOutline = outlineOfProjectionSurface;

                projectionChildren = compositedChildrenOfProjectionSurface;

                projectionTransform = &localTransformFromProjectionSurface;

            }

            child->computeOrderingImpl(childOp,

                    projectionOutline, projectionChildren, projectionTransform);

            child->computeOrderingImpl(childOp, projectionChildren, projectionTransform);

        }

    }

}

libs/hwui/RenderNode.h

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ private: 
    };



    void computeOrderingImpl(DrawRenderNodeOp* opState,

            const SkPath* outlineOfProjectionSurface,

            std::vector<DrawRenderNodeOp*>* compositedChildrenOfProjectionSurface,

            const mat4* transformFromProjectionSurface);