Merge "SurfaceFlinger: Select which layer state to visit" into oc-dev (3e0a85b9) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/Layer.cpp

+24 −17

Original line number	Diff line number	Diff line
		@@ -1033,7 +1033,7 @@ void Layer::onDraw(const sp<const DisplayDevice>& hw, const Region& clip,
		// figure out if there is something below us
		Region under;
		bool finished = false;
		mFlinger->mDrawingState.layersSortedByZ.traverseInZOrder([&](Layer* layer) {
		mFlinger->mDrawingState.traverseInZOrder([&](Layer* layer) {
		if (finished \|\| layer == static_cast<Layer const*>(this)) {
		finished = true;
		return;
		@@ -2519,7 +2519,7 @@ bool Layer::reparentChildren(const sp<IBinder>& newParentHandle) {
		}

		bool Layer::detachChildren() {
		traverseInZOrder([this](Layer* child) {
		traverseInZOrder(LayerVector::StateSet::Drawing, [this](Layer* child) {
		if (child == this) {
		return;
		}
		@@ -2553,20 +2553,26 @@ int32_t Layer::getZ() const {
		return mDrawingState.z;
		}

		LayerVector Layer::makeTraversalList() {
		if (mDrawingState.zOrderRelatives.size() == 0) {
		return mDrawingChildren;
		LayerVector Layer::makeTraversalList(LayerVector::StateSet stateSet) {
		LOG_ALWAYS_FATAL_IF(stateSet == LayerVector::StateSet::Invalid,
		"makeTraversalList received invalid stateSet");
		const bool useDrawing = stateSet == LayerVector::StateSet::Drawing;
		const LayerVector& children = useDrawing ? mDrawingChildren : mCurrentChildren;
		const State& state = useDrawing ? mDrawingState : mCurrentState;

		if (state.zOrderRelatives.size() == 0) {
		return children;
		}
		LayerVector traverse;

		for (const wp<Layer>& weakRelative : mDrawingState.zOrderRelatives) {
		for (const wp<Layer>& weakRelative : state.zOrderRelatives) {
		sp<Layer> strongRelative = weakRelative.promote();
		if (strongRelative != nullptr) {
		traverse.add(strongRelative);
		}
		}

		for (const sp<Layer>& child : mDrawingChildren) {
		for (const sp<Layer>& child : children) {
		traverse.add(child);
		}

		@@ -2576,8 +2582,8 @@ LayerVector Layer::makeTraversalList() {
		/**
		* Negatively signed relatives are before 'this' in Z-order.
		*/
		void Layer::traverseInZOrder(const std::function<void(Layer*)>& exec) {
		LayerVector list = makeTraversalList();
		void Layer::traverseInZOrder(LayerVector::StateSet stateSet, const LayerVector::Visitor& visitor) {
		LayerVector list = makeTraversalList(stateSet);

		size_t i = 0;
		for (; i < list.size(); i++) {
		@@ -2585,20 +2591,21 @@ void Layer::traverseInZOrder(const std::function<void(Layer*)>& exec) {
		if (relative->getZ() >= 0) {
		break;
		}
		relative->traverseInZOrder(exec);
		relative->traverseInZOrder(stateSet, visitor);
		}
		exec(this);
		visitor(this);
		for (; i < list.size(); i++) {
		const auto& relative = list[i];
		relative->traverseInZOrder(exec);
		relative->traverseInZOrder(stateSet, visitor);
		}
		}

		/**
		* Positively signed relatives are before 'this' in reverse Z-order.
		*/
		void Layer::traverseInReverseZOrder(const std::function<void(Layer*)>& exec) {
		LayerVector list = makeTraversalList();
		void Layer::traverseInReverseZOrder(LayerVector::StateSet stateSet,
		const LayerVector::Visitor& visitor) {
		LayerVector list = makeTraversalList(stateSet);

		int32_t i = 0;
		for (i = list.size()-1; i>=0; i--) {
		@@ -2606,12 +2613,12 @@ void Layer::traverseInReverseZOrder(const std::function<void(Layer*)>& exec) {
		if (relative->getZ() < 0) {
		break;
		}
		relative->traverseInReverseZOrder(exec);
		relative->traverseInReverseZOrder(stateSet, visitor);
		}
		exec(this);
		visitor(this);
		for (; i>=0; i--) {
		const auto& relative = list[i];
		relative->traverseInReverseZOrder(exec);
		relative->traverseInReverseZOrder(stateSet, visitor);
		}
		}

services/surfaceflinger/Layer.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -476,8 +476,9 @@ public:
		uint8_t getAlpha() const;
		#endif

		void traverseInReverseZOrder(const std::function<void(Layer*)>& exec);
		void traverseInZOrder(const std::function<void(Layer*)>& exec);
		void traverseInReverseZOrder(LayerVector::StateSet stateSet,
		const LayerVector::Visitor& visitor);
		void traverseInZOrder(LayerVector::StateSet stateSet, const LayerVector::Visitor& visitor);

		void addChild(const sp<Layer>& layer);
		// Returns index if removed, or negative value otherwise
		@@ -557,7 +558,7 @@ private:

		void setParent(const sp<Layer>& layer);

		LayerVector makeTraversalList();
		LayerVector makeTraversalList(LayerVector::StateSet stateSet);
		void addZOrderRelative(const wp<Layer>& relative);
		void removeZOrderRelative(const wp<Layer>& relative);

services/surfaceflinger/LayerVector.cpp

+15 −6

Original line number	Diff line number	Diff line
		@@ -18,9 +18,14 @@
		#include "Layer.h"

		namespace android {

		LayerVector::LayerVector() = default;

		LayerVector::LayerVector(const LayerVector& rhs) : SortedVector<sp<Layer>>(rhs) {
		}

		LayerVector::~LayerVector() = default;

		int LayerVector::do_compare(const void* lhs, const void* rhs) const
		{
		// sort layers per layer-stack, then by z-order and finally by sequence
		@@ -40,23 +45,27 @@ int LayerVector::do_compare(const void* lhs, const void* rhs) const
		return l->sequence - r->sequence;
		}

		void LayerVector::traverseInZOrder(const std::function<void(Layer*)>& consume) const {
		void LayerVector::traverseInZOrder(StateSet stateSet, const Visitor& visitor) const {
		for (size_t i = 0; i < size(); i++) {
		const auto& layer = (*this)[i];
		if (layer->getDrawingState().zOrderRelativeOf != nullptr) {
		auto& state = (stateSet == StateSet::Current) ? layer->getCurrentState()
		: layer->getDrawingState();
		if (state.zOrderRelativeOf != nullptr) {
		continue;
		}
		layer->traverseInZOrder(consume);
		layer->traverseInZOrder(stateSet, visitor);
		}
		}

		void LayerVector::traverseInReverseZOrder(const std::function<void(Layer*)>& consume) const {
		void LayerVector::traverseInReverseZOrder(StateSet stateSet, const Visitor& visitor) const {
		for (auto i = static_cast<int64_t>(size()) - 1; i >= 0; i--) {
		const auto& layer = (*this)[i];
		if (layer->getDrawingState().zOrderRelativeOf != nullptr) {
		auto& state = (stateSet == StateSet::Current) ? layer->getCurrentState()
		: layer->getDrawingState();
		if (state.zOrderRelativeOf != nullptr) {
		continue;
		}
		layer->traverseInReverseZOrder(consume);
		layer->traverseInReverseZOrder(stateSet, visitor);
		}
		}
		} // namespace android

services/surfaceflinger/LayerVector.h

+12 −3

Original line number	Diff line number	Diff line
		@@ -32,13 +32,22 @@ class Layer;
		*/
		class LayerVector : public SortedVector<sp<Layer>> {
		public:
		LayerVector() = default;
		LayerVector();
		LayerVector(const LayerVector& rhs);
		~LayerVector() override;

		enum class StateSet {
		Invalid,
		Current,
		Drawing,
		};

		// Sorts layer by layer-stack, Z order, and finally creation order (sequence).
		int do_compare(const void* lhs, const void* rhs) const override;

		void traverseInReverseZOrder(const std::function<void(Layer*)>& consume) const;
		void traverseInZOrder(const std::function<void(Layer*)>& consume) const;
		using Visitor = std::function<void(Layer*)>;
		void traverseInReverseZOrder(StateSet stateSet, const Visitor& visitor) const;
		void traverseInZOrder(StateSet stateSet, const Visitor& visitor) const;
		};
		}

services/surfaceflinger/SurfaceFlinger.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -4195,7 +4195,7 @@ void SurfaceFlinger::renderScreenImplLocked(
		if (state.z < minLayerZ \|\| state.z > maxLayerZ) {
		continue;
		}
		layer->traverseInZOrder([&](Layer* layer) {
		layer->traverseInZOrder(LayerVector::StateSet::Drawing, [&](Layer* layer) {
		if (!layer->isVisible()) {
		return;
		}
		@@ -4243,7 +4243,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(
		(state.z < minLayerZ \|\| state.z > maxLayerZ)) {
		continue;
		}
		layer->traverseInZOrder([&](Layer *layer) {
		layer->traverseInZOrder(LayerVector::StateSet::Drawing, [&](Layer *layer) {
		secureLayerIsVisible = secureLayerIsVisible \|\| (layer->isVisible() &&
		layer->isSecure());
		});
		@@ -4391,7 +4391,7 @@ void SurfaceFlinger::checkScreenshot(size_t w, size_t s, size_t h, void const* v
		const Layer::State& state(layer->getDrawingState());
		if (layer->getLayerStack() == hw->getLayerStack() && state.z >= minLayerZ &&
		state.z <= maxLayerZ) {
		layer->traverseInZOrder([&](Layer* layer) {
		layer->traverseInZOrder(LayerVector::StateSet::Drawing, [&](Layer* layer) {
		ALOGE("%c index=%zu, name=%s, layerStack=%d, z=%d, visible=%d, flags=%x, alpha=%.3f",
		layer->isVisible() ? '+' : '-',
		i, layer->getName().string(), layer->getLayerStack(), state.z,
		@@ -4405,12 +4405,12 @@ void SurfaceFlinger::checkScreenshot(size_t w, size_t s, size_t h, void const* v

		// ---------------------------------------------------------------------------

		void SurfaceFlinger::State::traverseInZOrder(const std::function<void(Layer*)>& consume) const {
		layersSortedByZ.traverseInZOrder(consume);
		void SurfaceFlinger::State::traverseInZOrder(const LayerVector::Visitor& visitor) const {
		layersSortedByZ.traverseInZOrder(stateSet, visitor);
		}

		void SurfaceFlinger::State::traverseInReverseZOrder(const std::function<void(Layer*)>& consume) const {
		layersSortedByZ.traverseInReverseZOrder(consume);
		void SurfaceFlinger::State::traverseInReverseZOrder(const LayerVector::Visitor& visitor) const {
		layersSortedByZ.traverseInReverseZOrder(stateSet, visitor);
		}

		}; // namespace android