Cleanup unused param in RenderNode::computeOrdering (f293259c) · Commits · e / os / android_frameworks_base

libs/hwui/RenderNode.cpp

+2 −8

libs/hwui/RenderNode.h

+0 −1

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

	void computeOrderingImpl(DrawRenderNodeOp* opState,		void computeOrderingImpl(DrawRenderNodeOp* opState,
	const SkPath* outlineOfProjectionSurface,
	std::vector<DrawRenderNodeOp> compositedChildrenOfProjectionSurface,		std::vector<DrawRenderNodeOp> compositedChildrenOfProjectionSurface,
	const mat4* transformFromProjectionSurface);		const mat4* transformFromProjectionSurface);

Original line number	Original line	Diff line number	Diff line
	@@ -520,14 +520,12 @@ void RenderNode::computeOrdering() {
	if (mDisplayListData == nullptr) return;		if (mDisplayListData == nullptr) return;
	for (unsigned int i = 0; i < mDisplayListData->children().size(); i++) {		for (unsigned int i = 0; i < mDisplayListData->children().size(); i++) {
	DrawRenderNodeOp* childOp = mDisplayListData->children()[i];		DrawRenderNodeOp* childOp = mDisplayListData->children()[i];
	childOp->mRenderNode->computeOrderingImpl(childOp,		childOp->mRenderNode->computeOrderingImpl(childOp, &mProjectedNodes, &mat4::identity());
	properties().getOutline().getPath(), &mProjectedNodes, &mat4::identity());
	}		}
	}		}

	void RenderNode::computeOrderingImpl(		void RenderNode::computeOrderingImpl(
	DrawRenderNodeOp* opState,		DrawRenderNodeOp* opState,
	const SkPath* outlineOfProjectionSurface,
	std::vector<DrawRenderNodeOp> compositedChildrenOfProjectionSurface,		std::vector<DrawRenderNodeOp> compositedChildrenOfProjectionSurface,
	const mat4* transformFromProjectionSurface) {		const mat4* transformFromProjectionSurface) {
	mProjectedNodes.clear();		mProjectedNodes.clear();
	@@ -555,7 +553,6 @@ void RenderNode::computeOrderingImpl(
	DrawRenderNodeOp* childOp = mDisplayListData->children()[i];		DrawRenderNodeOp* childOp = mDisplayListData->children()[i];
	RenderNode* child = childOp->mRenderNode;		RenderNode* child = childOp->mRenderNode;

	const SkPath* projectionOutline = nullptr;
	std::vector<DrawRenderNodeOp> projectionChildren = nullptr;		std::vector<DrawRenderNodeOp> projectionChildren = nullptr;
	const mat4* projectionTransform = nullptr;		const mat4* projectionTransform = nullptr;
	if (isProjectionReceiver && !child->properties().getProjectBackwards()) {		if (isProjectionReceiver && !child->properties().getProjectBackwards()) {
	@@ -564,7 +561,6 @@ void RenderNode::computeOrderingImpl(
	// Note that if a direct descendant is projecting backwards, we pass its		// Note that if a direct descendant is projecting backwards, we pass its
	// grandparent projection collection, since it shouldn't project onto its		// grandparent projection collection, since it shouldn't project onto its
	// parent, where it will already be drawing.		// parent, where it will already be drawing.
	projectionOutline = properties().getOutline().getPath();
	projectionChildren = &mProjectedNodes;		projectionChildren = &mProjectedNodes;
	projectionTransform = &mat4::identity();		projectionTransform = &mat4::identity();
	} else {		} else {
	@@ -572,12 +568,10 @@ void RenderNode::computeOrderingImpl(
	applyViewPropertyTransforms(localTransformFromProjectionSurface);		applyViewPropertyTransforms(localTransformFromProjectionSurface);
	haveAppliedPropertiesToProjection = true;		haveAppliedPropertiesToProjection = true;
	}		}
	projectionOutline = outlineOfProjectionSurface;
	projectionChildren = compositedChildrenOfProjectionSurface;		projectionChildren = compositedChildrenOfProjectionSurface;
	projectionTransform = &localTransformFromProjectionSurface;		projectionTransform = &localTransformFromProjectionSurface;
	}		}
	child->computeOrderingImpl(childOp,		child->computeOrderingImpl(childOp, projectionChildren, projectionTransform);