Merge "SF: Introduce LayerHierarchy and LayerHierarchyBuilder" (baf34203) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@ filegroup {
		"EventLog/EventLog.cpp",
		"FrontEnd/LayerCreationArgs.cpp",
		"FrontEnd/LayerHandle.cpp",
		"FrontEnd/LayerHierarchy.cpp",
		"FrontEnd/LayerLifecycleManager.cpp",
		"FrontEnd/RequestedLayerState.cpp",
		"FrontEnd/TransactionHandler.cpp",

services/surfaceflinger/FrontEnd/LayerHierarchy.cpp

0 → 100644

+472 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define ATRACE_TAG ATRACE_TAG_GRAPHICS
		#undef LOG_TAG
		#define LOG_TAG "LayerHierarchy"

		#include "LayerHierarchy.h"
		#include "SwapErase.h"

		namespace android::surfaceflinger::frontend {

		namespace {
		auto layerZCompare = [](const std::pair<LayerHierarchy*, LayerHierarchy::Variant>& lhs,
		const std::pair<LayerHierarchy*, LayerHierarchy::Variant>& rhs) {
		auto lhsLayer = lhs.first->getLayer();
		auto rhsLayer = rhs.first->getLayer();
		if (lhsLayer->layerStack != rhsLayer->layerStack) {
		return lhsLayer->layerStack.id < rhsLayer->layerStack.id;
		}
		if (lhsLayer->z != rhsLayer->z) {
		return lhsLayer->z < rhsLayer->z;
		}
		return lhsLayer->id < rhsLayer->id;
		};

		void insertSorted(std::vector<std::pair<LayerHierarchy*, LayerHierarchy::Variant>>& vec,
		std::pair<LayerHierarchy*, LayerHierarchy::Variant> value) {
		auto it = std::upper_bound(vec.begin(), vec.end(), value, layerZCompare);
		vec.insert(it, std::move(value));
		}
		} // namespace

		LayerHierarchy::LayerHierarchy(RequestedLayerState* layer) : mLayer(layer) {}

		LayerHierarchy::LayerHierarchy(const LayerHierarchy& hierarchy, bool childrenOnly) {
		mLayer = (childrenOnly) ? nullptr : hierarchy.mLayer;
		mChildren = hierarchy.mChildren;
		}

		void LayerHierarchy::traverse(const Visitor& visitor,
		LayerHierarchy::TraversalPath& traversalPath) const {
		if (mLayer) {
		bool breakTraversal = !visitor(*this, traversalPath);
		if (breakTraversal) {
		return;
		}
		}
		if (traversalPath.hasRelZLoop()) {
		LOG_ALWAYS_FATAL("Found relative z loop layerId:%d", traversalPath.invalidRelativeRootId);
		}
		for (auto& [child, childVariant] : mChildren) {
		ScopedAddToTraversalPath addChildToTraversalPath(traversalPath, child->mLayer->id,
		childVariant);
		child->traverse(visitor, traversalPath);
		}
		}

		void LayerHierarchy::traverseInZOrder(const Visitor& visitor,
		LayerHierarchy::TraversalPath& traversalPath) const {
		bool traverseThisLayer = (mLayer != nullptr);
		for (auto it = mChildren.begin(); it < mChildren.end(); it++) {
		auto& [child, childVariant] = *it;
		if (traverseThisLayer && child->getLayer()->z >= 0) {
		bool breakTraversal = !visitor(*this, traversalPath);
		if (breakTraversal) {
		return;
		}
		traverseThisLayer = false;
		}
		if (childVariant == LayerHierarchy::Variant::Detached) {
		continue;
		}
		ScopedAddToTraversalPath addChildToTraversalPath(traversalPath, child->mLayer->id,
		childVariant);
		child->traverseInZOrder(visitor, traversalPath);
		}

		if (traverseThisLayer) {
		visitor(*this, traversalPath);
		}
		}

		void LayerHierarchy::addChild(LayerHierarchy* child, LayerHierarchy::Variant variant) {
		insertSorted(mChildren, {child, variant});
		}

		void LayerHierarchy::removeChild(LayerHierarchy* child) {
		auto it = std::find_if(mChildren.begin(), mChildren.end(),
		[child](const std::pair<LayerHierarchy*, Variant>& x) {
		return x.first == child;
		});
		if (it == mChildren.end()) {
		LOG_ALWAYS_FATAL("Could not find child!");
		}
		mChildren.erase(it);
		}

		void LayerHierarchy::sortChildrenByZOrder() {
		std::sort(mChildren.begin(), mChildren.end(), layerZCompare);
		}

		void LayerHierarchy::updateChild(LayerHierarchy* hierarchy, LayerHierarchy::Variant variant) {
		auto it = std::find_if(mChildren.begin(), mChildren.end(),
		[hierarchy](std::pair<LayerHierarchy*, Variant>& child) {
		return child.first == hierarchy;
		});
		if (it == mChildren.end()) {
		LOG_ALWAYS_FATAL("Could not find child!");
		} else {
		it->second = variant;
		}
		}

		const RequestedLayerState* LayerHierarchy::getLayer() const {
		return mLayer;
		}

		std::string LayerHierarchy::getDebugStringShort() const {
		std::string debug = "LayerHierarchy{";
		debug += ((mLayer) ? mLayer->getDebugStringShort() : "root") + " ";
		if (mChildren.empty()) {
		debug += "no children";
		} else {
		debug += std::to_string(mChildren.size()) + " children";
		}
		return debug + "}";
		}

		std::string LayerHierarchy::getDebugString(const char* prefix) const {
		std::string debug = prefix + getDebugStringShort();
		for (auto& [child, childVariant] : mChildren) {
		std::string childPrefix = " " + std::string(prefix) + " " + std::to_string(childVariant);
		debug += "\n" + child->getDebugString(childPrefix.c_str());
		}
		return debug;
		}

		bool LayerHierarchy::hasRelZLoop(uint32_t& outInvalidRelativeRoot) const {
		outInvalidRelativeRoot = UNASSIGNED_LAYER_ID;
		traverse([&outInvalidRelativeRoot](const LayerHierarchy&,
		const LayerHierarchy::TraversalPath& traversalPath) -> bool {
		if (traversalPath.hasRelZLoop()) {
		outInvalidRelativeRoot = traversalPath.invalidRelativeRootId;
		return false;
		}
		return true;
		});
		return outInvalidRelativeRoot != UNASSIGNED_LAYER_ID;
		}

		LayerHierarchyBuilder::LayerHierarchyBuilder(
		const std::vector<std::unique_ptr<RequestedLayerState>>& layers) {
		mHierarchies.reserve(layers.size());
		mLayerIdToHierarchy.reserve(layers.size());
		for (auto& layer : layers) {
		mHierarchies.emplace_back(std::make_unique<LayerHierarchy>(layer.get()));
		mLayerIdToHierarchy[layer->id] = mHierarchies.back().get();
		}
		for (const auto& layer : layers) {
		onLayerAdded(layer.get());
		}
		detachHierarchyFromRelativeParent(&mOffscreenRoot);
		}

		void LayerHierarchyBuilder::attachToParent(LayerHierarchy* hierarchy) {
		auto layer = hierarchy->mLayer;
		LayerHierarchy::Variant type = layer->hasValidRelativeParent()
		? LayerHierarchy::Variant::Detached
		: LayerHierarchy::Variant::Attached;

		LayerHierarchy* parent;

		if (layer->parentId != UNASSIGNED_LAYER_ID) {
		parent = getHierarchyFromId(layer->parentId);
		} else if (layer->canBeRoot) {
		parent = &mRoot;
		} else {
		parent = &mOffscreenRoot;
		}
		parent->addChild(hierarchy, type);
		hierarchy->mParent = parent;
		}

		void LayerHierarchyBuilder::detachFromParent(LayerHierarchy* hierarchy) {
		hierarchy->mParent->removeChild(hierarchy);
		hierarchy->mParent = nullptr;
		}

		void LayerHierarchyBuilder::attachToRelativeParent(LayerHierarchy* hierarchy) {
		auto layer = hierarchy->mLayer;
		if (!layer->hasValidRelativeParent() \|\| hierarchy->mRelativeParent) {
		return;
		}

		if (layer->relativeParentId != UNASSIGNED_LAYER_ID) {
		hierarchy->mRelativeParent = getHierarchyFromId(layer->relativeParentId);
		} else {
		hierarchy->mRelativeParent = &mOffscreenRoot;
		}
		hierarchy->mRelativeParent->addChild(hierarchy, LayerHierarchy::Variant::Relative);
		hierarchy->mParent->updateChild(hierarchy, LayerHierarchy::Variant::Detached);
		}

		void LayerHierarchyBuilder::detachFromRelativeParent(LayerHierarchy* hierarchy) {
		if (hierarchy->mRelativeParent) {
		hierarchy->mRelativeParent->removeChild(hierarchy);
		}
		hierarchy->mRelativeParent = nullptr;
		hierarchy->mParent->updateChild(hierarchy, LayerHierarchy::Variant::Attached);
		}

		void LayerHierarchyBuilder::attachHierarchyToRelativeParent(LayerHierarchy* root) {
		if (root->mLayer) {
		attachToRelativeParent(root);
		}
		for (auto& [child, childVariant] : root->mChildren) {
		if (childVariant == LayerHierarchy::Variant::Detached \|\|
		childVariant == LayerHierarchy::Variant::Attached) {
		attachHierarchyToRelativeParent(child);
		}
		}
		}

		void LayerHierarchyBuilder::detachHierarchyFromRelativeParent(LayerHierarchy* root) {
		if (root->mLayer) {
		detachFromRelativeParent(root);
		}
		for (auto& [child, childVariant] : root->mChildren) {
		if (childVariant == LayerHierarchy::Variant::Detached \|\|
		childVariant == LayerHierarchy::Variant::Attached) {
		detachHierarchyFromRelativeParent(child);
		}
		}
		}

		void LayerHierarchyBuilder::onLayerAdded(RequestedLayerState* layer) {
		LayerHierarchy* hierarchy = getHierarchyFromId(layer->id);
		attachToParent(hierarchy);
		attachToRelativeParent(hierarchy);

		if (layer->mirrorId != UNASSIGNED_LAYER_ID) {
		LayerHierarchy* mirror = getHierarchyFromId(layer->mirrorId);
		hierarchy->addChild(mirror, LayerHierarchy::Variant::Mirror);
		}
		}

		void LayerHierarchyBuilder::onLayerDestroyed(RequestedLayerState* layer) {
		LayerHierarchy* hierarchy = getHierarchyFromId(layer->id, /crashOnFailure=/false);
		if (!hierarchy) {
		// Layer was never part of the hierarchy if it was created and destroyed in the same
		// transaction.
		return;
		}
		// detach from parent
		detachFromRelativeParent(hierarchy);
		detachFromParent(hierarchy);

		// detach children
		for (auto& [child, variant] : hierarchy->mChildren) {
		if (variant == LayerHierarchy::Variant::Attached \|\|
		variant == LayerHierarchy::Variant::Detached) {
		mOffscreenRoot.addChild(child, LayerHierarchy::Variant::Attached);
		child->mParent = &mOffscreenRoot;
		} else if (variant == LayerHierarchy::Variant::Relative) {
		mOffscreenRoot.addChild(child, LayerHierarchy::Variant::Attached);
		child->mRelativeParent = &mOffscreenRoot;
		}
		}

		swapErase(mHierarchies, [hierarchy](std::unique_ptr<LayerHierarchy>& layerHierarchy) {
		return layerHierarchy.get() == hierarchy;
		});
		mLayerIdToHierarchy.erase(layer->id);
		}

		void LayerHierarchyBuilder::updateMirrorLayer(RequestedLayerState* layer) {
		LayerHierarchy* hierarchy = getHierarchyFromId(layer->id);
		auto it = hierarchy->mChildren.begin();
		while (it != hierarchy->mChildren.end()) {
		if (it->second == LayerHierarchy::Variant::Mirror) {
		hierarchy->mChildren.erase(it);
		break;
		}
		it++;
		}

		if (layer->mirrorId != UNASSIGNED_LAYER_ID) {
		hierarchy->addChild(getHierarchyFromId(layer->mirrorId), LayerHierarchy::Variant::Mirror);
		}
		}

		void LayerHierarchyBuilder::update(
		const std::vector<std::unique_ptr<RequestedLayerState>>& layers,
		const std::vector<std::unique_ptr<RequestedLayerState>>& destroyedLayers) {
		// rebuild map
		for (auto& layer : layers) {
		if (layer->changes.test(RequestedLayerState::Changes::Created)) {
		mHierarchies.emplace_back(std::make_unique<LayerHierarchy>(layer.get()));
		mLayerIdToHierarchy[layer->id] = mHierarchies.back().get();
		}
		}

		for (auto& layer : layers) {
		if (layer->changes.get() == 0) {
		continue;
		}
		if (layer->changes.test(RequestedLayerState::Changes::Created)) {
		onLayerAdded(layer.get());
		continue;
		}
		LayerHierarchy* hierarchy = getHierarchyFromId(layer->id);
		if (layer->changes.test(RequestedLayerState::Changes::Parent)) {
		detachFromParent(hierarchy);
		attachToParent(hierarchy);
		}
		if (layer->changes.test(RequestedLayerState::Changes::RelativeParent)) {
		detachFromRelativeParent(hierarchy);
		attachToRelativeParent(hierarchy);
		}
		if (layer->changes.test(RequestedLayerState::Changes::Z)) {
		hierarchy->mParent->sortChildrenByZOrder();
		if (hierarchy->mRelativeParent) {
		hierarchy->mRelativeParent->sortChildrenByZOrder();
		}
		}
		if (layer->changes.test(RequestedLayerState::Changes::Mirror)) {
		updateMirrorLayer(layer.get());
		}
		}

		for (auto& layer : destroyedLayers) {
		onLayerDestroyed(layer.get());
		}
		// When moving from onscreen to offscreen and vice versa, we need to attach and detach
		// from our relative parents. This walks down both trees to do so. We can optimize this
		// further by tracking onscreen, offscreen state in LayerHierarchy.
		detachHierarchyFromRelativeParent(&mOffscreenRoot);
		attachHierarchyToRelativeParent(&mRoot);
		}

		const LayerHierarchy& LayerHierarchyBuilder::getHierarchy() const {
		return mRoot;
		}

		const LayerHierarchy& LayerHierarchyBuilder::getOffscreenHierarchy() const {
		return mOffscreenRoot;
		}

		std::string LayerHierarchyBuilder::getDebugString(uint32_t layerId, uint32_t depth) const {
		if (depth > 10) return "too deep, loop?";
		if (layerId == UNASSIGNED_LAYER_ID) return "";
		auto it = mLayerIdToHierarchy.find(layerId);
		if (it == mLayerIdToHierarchy.end()) return "not found";

		LayerHierarchy* hierarchy = it->second;
		if (!hierarchy->mLayer) return "none";

		std::string debug =
		"[" + std::to_string(hierarchy->mLayer->id) + "] " + hierarchy->mLayer->name;
		if (hierarchy->mRelativeParent) {
		debug += " Relative:" + hierarchy->mRelativeParent->getDebugStringShort();
		}
		if (hierarchy->mParent) {
		debug += " Parent:" + hierarchy->mParent->getDebugStringShort();
		}
		return debug;
		}

		LayerHierarchy LayerHierarchyBuilder::getPartialHierarchy(uint32_t layerId,
		bool childrenOnly) const {
		auto it = mLayerIdToHierarchy.find(layerId);
		if (it == mLayerIdToHierarchy.end()) return {nullptr};

		LayerHierarchy hierarchy(*it->second, childrenOnly);
		return hierarchy;
		}

		LayerHierarchy* LayerHierarchyBuilder::getHierarchyFromId(uint32_t layerId, bool crashOnFailure) {
		auto it = mLayerIdToHierarchy.find(layerId);
		if (it == mLayerIdToHierarchy.end()) {
		if (crashOnFailure) {
		LOG_ALWAYS_FATAL("Could not find hierarchy for layer id %d", layerId);
		}
		return nullptr;
		};

		return it->second;
		}

		LayerHierarchy::TraversalPath LayerHierarchy::TraversalPath::ROOT_TRAVERSAL_ID =
		{.id = UNASSIGNED_LAYER_ID, .variant = LayerHierarchy::Attached};

		std::string LayerHierarchy::TraversalPath::toString() const {
		std::string debugString = "TraversalPath{.id = " + std::to_string(id);

		if (!mirrorRootIds.empty()) {
		debugString += ", .mirrorRootIds=";
		for (auto rootId : mirrorRootIds) {
		debugString += std::to_string(rootId) + ",";
		}
		}

		if (!relativeRootIds.empty()) {
		debugString += ", .relativeRootIds=";
		for (auto rootId : relativeRootIds) {
		debugString += std::to_string(rootId) + ",";
		}
		}

		if (hasRelZLoop()) {
		debugString += ", hasRelZLoop=true invalidRelativeRootId=";
		debugString += std::to_string(invalidRelativeRootId) + ",";
		}

		debugString += "}";
		return debugString;
		}

		// Helper class to update a passed in TraversalPath when visiting a child. When the object goes out
		// of scope the TraversalPath is reset to its original state.
		LayerHierarchy::ScopedAddToTraversalPath::ScopedAddToTraversalPath(TraversalPath& traversalPath,
		uint32_t layerId,
		LayerHierarchy::Variant variant)
		: mTraversalPath(traversalPath),
		mParentId(traversalPath.id),
		mParentVariant(traversalPath.variant) {
		// Update the traversal id with the child layer id and variant. Parent id and variant are
		// stored to reset the id upon destruction.
		traversalPath.id = layerId;
		traversalPath.variant = variant;
		if (variant == LayerHierarchy::Variant::Mirror) {
		traversalPath.mirrorRootIds.emplace_back(layerId);
		}
		if (variant == LayerHierarchy::Variant::Relative) {
		if (std::find(traversalPath.relativeRootIds.begin(), traversalPath.relativeRootIds.end(),
		layerId) != traversalPath.relativeRootIds.end()) {
		traversalPath.invalidRelativeRootId = layerId;
		}
		traversalPath.relativeRootIds.emplace_back(layerId);
		}
		}
		LayerHierarchy::ScopedAddToTraversalPath::~ScopedAddToTraversalPath() {
		// Reset the traversal id to its original parent state using the state that was saved in
		// the constructor.
		if (mTraversalPath.variant == LayerHierarchy::Variant::Mirror) {
		mTraversalPath.mirrorRootIds.pop_back();
		}
		if (mTraversalPath.variant == LayerHierarchy::Variant::Relative) {
		mTraversalPath.relativeRootIds.pop_back();
		}
		if (mTraversalPath.invalidRelativeRootId == mTraversalPath.id) {
		mTraversalPath.invalidRelativeRootId = UNASSIGNED_LAYER_ID;
		}
		mTraversalPath.id = mParentId;
		mTraversalPath.variant = mParentVariant;
		}

		} // namespace android::surfaceflinger::frontend

services/surfaceflinger/FrontEnd/LayerHierarchy.h

0 → 100644

+163 −0

File added.

Preview size limit exceeded, changes collapsed.

services/surfaceflinger/FrontEnd/LayerLifecycleManager.cpp

+38 −24

Original line number	Diff line number	Diff line
		@@ -42,10 +42,10 @@ void LayerLifecycleManager::addLayers(std::vector<std::unique_ptr<RequestedLayer
		it->second.owner.getDebugString().c_str());
		}

		linkLayer(layer.parentId, layer.id);
		linkLayer(layer.relativeParentId, layer.id);
		linkLayer(layer.mirrorId, layer.id);
		linkLayer(layer.touchCropId, layer.id);
		layer.parentId = linkLayer(layer.parentId, layer.id);
		layer.relativeParentId = linkLayer(layer.relativeParentId, layer.id);
		layer.mirrorId = linkLayer(layer.mirrorId, layer.id);
		layer.touchCropId = linkLayer(layer.touchCropId, layer.id);

		mLayers.emplace_back(std::move(newLayer));
		}
		@@ -83,10 +83,10 @@ void LayerLifecycleManager::onHandlesDestroyed(const std::vector<uint32_t>& dest

		RequestedLayerState& layer = it->second.owner;

		unlinkLayer(layer.parentId, layer.id);
		unlinkLayer(layer.relativeParentId, layer.id);
		unlinkLayer(layer.mirrorId, layer.id);
		unlinkLayer(layer.touchCropId, layer.id);
		layer.parentId = unlinkLayer(layer.parentId, layer.id);
		layer.relativeParentId = unlinkLayer(layer.relativeParentId, layer.id);
		layer.mirrorId = unlinkLayer(layer.mirrorId, layer.id);
		layer.touchCropId = unlinkLayer(layer.touchCropId, layer.id);

		auto& references = it->second.references;
		for (uint32_t linkedLayerId : references) {
		@@ -199,15 +199,15 @@ void LayerLifecycleManager::applyTransactions(const std::vector<TransactionState

		if (oldParentId != layer->parentId) {
		unlinkLayer(oldParentId, layer->id);
		linkLayer(layer->parentId, layer->id);
		layer->parentId = linkLayer(layer->parentId, layer->id);
		}
		if (oldRelativeParentId != layer->relativeParentId) {
		unlinkLayer(oldRelativeParentId, layer->id);
		linkLayer(layer->relativeParentId, layer->id);
		layer->relativeParentId = linkLayer(layer->relativeParentId, layer->id);
		}
		if (oldTouchCropId != layer->touchCropId) {
		unlinkLayer(oldTouchCropId, layer->id);
		linkLayer(layer->touchCropId, layer->id);
		layer->touchCropId = linkLayer(layer->touchCropId, layer->id);
		}

		mGlobalChanges \|= layer->changes &
		@@ -287,26 +287,28 @@ std::vector<uint32_t>* LayerLifecycleManager::getLinkedLayersFromId(uint32_t id)
		return &it->second.references;
		}

		void LayerLifecycleManager::linkLayer(uint32_t layerId, uint32_t layerToLink) {
		if (layerToLink && layerId != UNASSIGNED_LAYER_ID) {
		uint32_t LayerLifecycleManager::linkLayer(uint32_t layerId, uint32_t layerToLink) {
		if (layerId == UNASSIGNED_LAYER_ID) {
		return UNASSIGNED_LAYER_ID;
		}

		std::vector<uint32_t>* linkedLayers = getLinkedLayersFromId(layerId);
		if (!linkedLayers) {
		LOG_ALWAYS_FATAL("Could not find layer id %d to link %d", layerId, layerToLink);
		return;
		ALOGV("Could not find layer id %d to link %d. Parent is probably destroyed", layerId,
		layerToLink);
		return UNASSIGNED_LAYER_ID;
		}
		linkedLayers->emplace_back(layerToLink);
		return layerId;
		}
		}

		void LayerLifecycleManager::unlinkLayer(uint32_t& inOutLayerId, uint32_t linkedLayer) {
		uint32_t layerId = inOutLayerId;
		inOutLayerId = UNASSIGNED_LAYER_ID;

		uint32_t LayerLifecycleManager::unlinkLayer(uint32_t layerId, uint32_t linkedLayer) {
		std::vector<uint32_t>* linkedLayers = getLinkedLayersFromId(layerId);
		if (!linkedLayers) {
		return;
		return UNASSIGNED_LAYER_ID;
		}
		swapErase(*linkedLayers, linkedLayer);
		return UNASSIGNED_LAYER_ID;
		}

		std::string LayerLifecycleManager::References::getDebugString() const {
		@@ -318,4 +320,16 @@ std::string LayerLifecycleManager::References::getDebugString() const {
		return debugInfo;
		}

		void LayerLifecycleManager::fixRelativeZLoop(uint32_t relativeRootId) {
		auto it = mIdToLayer.find(relativeRootId);
		if (it == mIdToLayer.end()) {
		return;
		}
		RequestedLayerState& layer = it->second.owner;
		layer.relativeParentId = unlinkLayer(layer.relativeParentId, layer.id);
		layer.changes \|=
		RequestedLayerState::Changes::Hierarchy \| RequestedLayerState::Changes::RelativeParent;
		mGlobalChanges \|= RequestedLayerState::Changes::Hierarchy;
		}

		} // namespace android::surfaceflinger::frontend

services/surfaceflinger/FrontEnd/LayerLifecycleManager.h

+8 −2

Original line number	Diff line number	Diff line
		@@ -42,6 +42,12 @@ public:
		void applyTransactions(const std::vector<TransactionState>&);
		void onHandlesDestroyed(const std::vector<uint32_t>&);

		// Detaches the layer from its relative parent to prevent a loop in the
		// layer hierarchy. This overrides the RequestedLayerState and leaves
		// the system in an invalid state. This is always a client error that
		// needs to be fixed but overriding the state allows us to fail gracefully.
		void fixRelativeZLoop(uint32_t relativeRootId);

		// Destroys RequestedLayerStates that are marked to be destroyed. Invokes all
		// ILifecycleListener callbacks and clears any change flags from previous state
		// updates. This function should be called outside the hot path since it's not
		@@ -72,8 +78,8 @@ private:

		RequestedLayerState* getLayerFromId(uint32_t);
		std::vector<uint32_t>* getLinkedLayersFromId(uint32_t);
		void linkLayer(uint32_t layerId, uint32_t layerToLink);
		void unlinkLayer(uint32_t& inOutLayerId, uint32_t linkedLayer);
		uint32_t linkLayer(uint32_t layerId, uint32_t layerToLink);
		uint32_t unlinkLayer(uint32_t layerId, uint32_t linkedLayer);

		struct References {
		// Lifetime tied to mLayers