Merge "Revert "Layer: Use raw pointers for Current/Drawing parent""
diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index 969fd67..861d496 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -227,7 +227,7 @@
* of a camera where the buffer remains in native orientation,
* we want the pixels to always be upright.
*/
- auto p = mDrawingParent;
+ sp<Layer> p = mDrawingParent.promote();
if (p != nullptr) {
const auto parentTransform = p->getTransform();
tr = tr * inverseOrientation(parentTransform.getOrientation());
diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index c213570..c0753f9 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -937,7 +937,7 @@
* how to go from screen space back to window space.
*/
ui::Transform BufferStateLayer::getInputTransform() const {
- auto parent = mDrawingParent;
+ sp<Layer> parent = mDrawingParent.promote();
if (parent == nullptr) {
return ui::Transform();
}
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 3b98d50..388181c 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -179,23 +179,9 @@
if (mDrawingState.sidebandStream != nullptr) {
mFlinger->mTunnelModeEnabledReporter->decrementTunnelModeCount();
}
-
if (mHadClonedChild) {
mFlinger->mNumClones--;
}
-
- for (auto const& child : mCurrentChildren) {
- if (child->mCurrentParent == this) child->mCurrentParent = nullptr;
- if (child->mDrawingParent == this) {
- child->mDrawingParent = nullptr;
- }
- }
- for (auto const& child : mDrawingChildren) {
- if (child->mCurrentParent == this) child->mCurrentParent = nullptr;
- if (child->mDrawingParent == this) {
- child->mDrawingParent = nullptr;
- }
- }
}
LayerCreationArgs::LayerCreationArgs(SurfaceFlinger* flinger, sp<Client> client, std::string name,
@@ -252,7 +238,7 @@
}
sp<Layer> Layer::getRootLayer() {
- auto parent = getParent();
+ sp<Layer> parent = getParent();
if (parent == nullptr) {
return this;
}
@@ -677,7 +663,7 @@
return true;
}
- const auto p = mDrawingParent;
+ const auto p = mDrawingParent.promote();
return (p != nullptr) ? p->isSecure() : false;
}
@@ -860,7 +846,7 @@
if (getDrawingState().isTrustedOverlay) {
return true;
}
- const auto p = mDrawingParent;
+ const auto& p = mDrawingParent.promote();
return (p != nullptr) && p->isTrustedOverlay();
}
@@ -1040,7 +1026,7 @@
return mDrawingState.frameRateSelectionPriority;
}
// If not, search whether its parents have it set.
- auto parent = getParent();
+ sp<Layer> parent = getParent();
if (parent != nullptr) {
return parent->getFrameRateSelectionPriority();
}
@@ -1053,11 +1039,10 @@
};
ui::LayerStack Layer::getLayerStack() const {
- auto p = mDrawingParent;
- if (p == nullptr) {
- return getDrawingState().layerStack;
+ if (const auto parent = mDrawingParent.promote()) {
+ return parent->getLayerStack();
}
- return mDrawingParent->getLayerStack();
+ return getDrawingState().layerStack;
}
bool Layer::setShadowRadius(float shadowRadius) {
@@ -1102,7 +1087,7 @@
return mDrawingState.stretchEffect;
}
- auto parent = mDrawingParent;
+ sp<Layer> parent = getParent();
if (parent != nullptr) {
auto effect = parent->getStretchEffect();
if (effect.hasEffect()) {
@@ -1317,7 +1302,7 @@
bool Layer::isHiddenByPolicy() const {
const State& s(mDrawingState);
- auto parent = mDrawingParent;
+ const auto& parent = mDrawingParent.promote();
if (parent != nullptr && parent->isHiddenByPolicy()) {
return true;
}
@@ -1364,7 +1349,7 @@
LayerDebugInfo info;
const State& ds = getDrawingState();
info.mName = getName();
- auto parent = mDrawingParent;
+ sp<Layer> parent = mDrawingParent.promote();
info.mParentName = parent ? parent->getName() : "none"s;
info.mType = getType();
info.mTransparentRegion = ds.activeTransparentRegion_legacy;
@@ -1596,7 +1581,7 @@
void Layer::setChildrenDrawingParent(const sp<Layer>& newParent) {
for (const sp<Layer>& child : mDrawingChildren) {
- child->mDrawingParent = newParent.get();
+ child->mDrawingParent = newParent;
child->computeBounds(newParent->mBounds, newParent->mEffectiveTransform,
newParent->mEffectiveShadowRadius);
}
@@ -1616,7 +1601,7 @@
}
}
- auto parent = getParent();
+ sp<Layer> parent = getParent();
if (parent != nullptr) {
parent->removeChild(this);
}
@@ -1651,7 +1636,7 @@
mat4 Layer::getColorTransform() const {
mat4 colorTransform = mat4(getDrawingState().colorTransform);
- if (auto parent = mDrawingParent; parent != nullptr) {
+ if (sp<Layer> parent = mDrawingParent.promote(); parent != nullptr) {
colorTransform = parent->getColorTransform() * colorTransform;
}
return colorTransform;
@@ -1659,7 +1644,7 @@
bool Layer::hasColorTransform() const {
bool hasColorTransform = getDrawingState().hasColorTransform;
- if (auto parent = mDrawingParent; parent != nullptr) {
+ if (sp<Layer> parent = mDrawingParent.promote(); parent != nullptr) {
hasColorTransform = hasColorTransform || parent->hasColorTransform();
}
return hasColorTransform;
@@ -1673,7 +1658,7 @@
}
void Layer::setParent(const sp<Layer>& layer) {
- mCurrentParent = layer.get();
+ mCurrentParent = layer;
}
int32_t Layer::getZ(LayerVector::StateSet) const {
@@ -1877,7 +1862,7 @@
}
half Layer::getAlpha() const {
- auto p = mDrawingParent;
+ const auto& p = mDrawingParent.promote();
half parentAlpha = (p != nullptr) ? p->getAlpha() : 1.0_hf;
return parentAlpha * getDrawingState().color.a;
@@ -1888,7 +1873,7 @@
if (fixedTransformHint != ui::Transform::ROT_INVALID) {
return fixedTransformHint;
}
- auto p = mCurrentParent;
+ const auto& p = mCurrentParent.promote();
if (!p) return fixedTransformHint;
return p->getFixedTransformHint();
}
@@ -1899,7 +1884,7 @@
}
int32_t Layer::getBackgroundBlurRadius() const {
- auto p = mDrawingParent;
+ const auto& p = mDrawingParent.promote();
half parentAlpha = (p != nullptr) ? p->getAlpha() : 1.0_hf;
return parentAlpha * getDrawingState().backgroundBlurRadius;
@@ -1917,8 +1902,9 @@
Layer::RoundedCornerState Layer::getRoundedCornerState() const {
// Get parent settings
RoundedCornerState parentSettings;
- if (mDrawingParent != nullptr) {
- parentSettings = mDrawingParent->getRoundedCornerState();
+ const auto& parent = mDrawingParent.promote();
+ if (parent != nullptr) {
+ parentSettings = parent->getRoundedCornerState();
if (parentSettings.radius > 0) {
ui::Transform t = getActiveTransform(getDrawingState());
t = t.inverse();
@@ -2134,7 +2120,7 @@
LayerProtoHelper::writeToProtoDeprecated(requestedTransform,
layerInfo->mutable_requested_transform());
- auto parent = useDrawing ? mDrawingParent : mCurrentParent;
+ auto parent = useDrawing ? mDrawingParent.promote() : mCurrentParent.promote();
if (parent != nullptr) {
layerInfo->set_parent(parent->sequence);
} else {
@@ -2281,9 +2267,9 @@
}
void Layer::fillTouchOcclusionMode(WindowInfo& info) {
- Layer* p = this;
+ sp<Layer> p = this;
while (p != nullptr && !p->hasInputInfo()) {
- p = p->mDrawingParent;
+ p = p->mDrawingParent.promote();
}
if (p != nullptr) {
info.touchOcclusionMode = p->mDrawingState.inputInfo.touchOcclusionMode;
@@ -2295,8 +2281,9 @@
if (mode == gui::DropInputMode::ALL) {
return mode;
}
- if (mDrawingParent) {
- gui::DropInputMode parentMode = mDrawingParent->getDropInputMode();
+ sp<Layer> parent = mDrawingParent.promote();
+ if (parent) {
+ gui::DropInputMode parentMode = parent->getDropInputMode();
if (parentMode != gui::DropInputMode::NONE) {
return parentMode;
}
@@ -2323,7 +2310,8 @@
}
// Check if the parent has set an alpha on the layer
- if (mDrawingParent && mDrawingParent->getAlpha() != 1.0_hf) {
+ sp<Layer> parent = mDrawingParent.promote();
+ if (parent && parent->getAlpha() != 1.0_hf) {
info.inputFeatures |= WindowInfo::Feature::DROP_INPUT;
ALOGV("Dropping input for %s as requested by policy because alpha=%f", getDebugName(),
static_cast<float>(getAlpha()));
@@ -2421,10 +2409,10 @@
if (mClonedChild != nullptr) {
return this;
}
- if (mDrawingParent == nullptr) {
+ if (mDrawingParent == nullptr || mDrawingParent.promote() == nullptr) {
return nullptr;
}
- return mDrawingParent->getClonedRoot();
+ return mDrawingParent.promote()->getClonedRoot();
}
bool Layer::hasInputInfo() const {
@@ -2611,7 +2599,8 @@
return true;
}
- return mDrawingParent && mDrawingParent->isInternalDisplayOverlay();
+ sp<Layer> parent = mDrawingParent.promote();
+ return parent && parent->isInternalDisplayOverlay();
}
void Layer::setClonedChild(const sp<Layer>& clonedChild) {
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 4569f9a..bf338c1 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -796,12 +796,12 @@
// Returns index if removed, or negative value otherwise
// for symmetry with Vector::remove
ssize_t removeChild(const sp<Layer>& layer);
+ sp<Layer> getParent() const { return mCurrentParent.promote(); }
// Should be called with the surfaceflinger statelock held
bool isAtRoot() const { return mIsAtRoot; }
void setIsAtRoot(bool isAtRoot) { mIsAtRoot = isAtRoot; }
- Layer* getParent() const { return mCurrentParent; }
bool hasParent() const { return getParent() != nullptr; }
Rect getScreenBounds(bool reduceTransparentRegion = true) const;
bool setChildLayer(const sp<Layer>& childLayer, int32_t z);
@@ -1008,8 +1008,8 @@
LayerVector mCurrentChildren{LayerVector::StateSet::Current};
LayerVector mDrawingChildren{LayerVector::StateSet::Drawing};
- Layer* mCurrentParent = nullptr;
- Layer* mDrawingParent = nullptr;
+ wp<Layer> mCurrentParent;
+ wp<Layer> mDrawingParent;
// Window types from WindowManager.LayoutParams
const gui::WindowInfo::Type mWindowType;
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e565bbb..8d7221c 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3381,7 +3381,6 @@
states.add(composerState);
lbc->updateTransformHint(mActiveDisplayTransformHint);
-
if (outTransformHint) {
*outTransformHint = mActiveDisplayTransformHint;
}
@@ -3922,7 +3921,7 @@
}
if (what & layer_state_t::eLayerChanged) {
// NOTE: index needs to be calculated before we update the state
- auto p = layer->getParent();
+ const auto& p = layer->getParent();
if (p == nullptr) {
ssize_t idx = mCurrentState.layersSortedByZ.indexOf(layer);
if (layer->setLayer(s.z) && idx >= 0) {
@@ -3940,7 +3939,7 @@
}
if (what & layer_state_t::eRelativeLayerChanged) {
// NOTE: index needs to be calculated before we update the state
- auto p = layer->getParent();
+ const auto& p = layer->getParent();
const auto& relativeHandle = s.relativeLayerSurfaceControl ?
s.relativeLayerSurfaceControl->getHandle() : nullptr;
if (p == nullptr) {
@@ -6078,7 +6077,7 @@
return;
}
- auto p = layer;
+ sp<Layer> p = layer;
while (p != nullptr) {
if (excludeLayers.count(p) != 0) {
return;
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index dd20d0d..c23fcc7 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -289,7 +289,7 @@
}
static void setLayerDrawingParent(const sp<Layer>& layer, const sp<Layer>& drawingParent) {
- layer->mDrawingParent = drawingParent.get();
+ layer->mDrawingParent = drawingParent;
}
/* ------------------------------------------------------------------------