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

Commit d278faab authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "[sf] Properly update clones of clones" into udc-dev am: 351604dd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22898934



Change-Id: I075445f08476fe11967fb2c05f33be4099e3d451
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5888fbb 351604dd

services/surfaceflinger/Layer.cpp

+12 −4
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ Layer::~Layer() { 
        mFlinger->mTunnelModeEnabledReporter->decrementTunnelModeCount();

    }

    if (mHadClonedChild) {

        mFlinger->mNumClones--;

        auto& roots = mFlinger->mLayerMirrorRoots;

        roots.erase(std::remove(roots.begin(), roots.end(), this), roots.end());

    }

    if (hasTrustedPresentationListener()) {

        mFlinger->mNumTrustedPresentationListeners--;
@@ -2594,7 +2595,7 @@ void Layer::updateCloneBufferInfo() { 
    mDrawingState.inputInfo = tmpInputInfo;

}



void Layer::updateMirrorInfo() {

bool Layer::updateMirrorInfo(const std::deque<Layer*>& cloneRootsPendingUpdates) {

    if (mClonedChild == nullptr || !mClonedChild->isClonedFromAlive()) {

        // If mClonedChild is null, there is nothing to mirror. If isClonedFromAlive returns false,

        // it means that there is a clone, but the layer it was cloned from has been destroyed. In
@@ -2602,7 +2603,7 @@ void Layer::updateMirrorInfo() { 
        // destroyed. The root, this layer, will still be around since the client can continue

        // to hold a reference, but no cloned layers will be displayed.

        mClonedChild = nullptr;

        return;

        return true;

    }



    std::map<sp<Layer>, sp<Layer>> clonedLayersMap;
@@ -2617,6 +2618,13 @@ void Layer::updateMirrorInfo() { 
    mClonedChild->updateClonedDrawingState(clonedLayersMap);

    mClonedChild->updateClonedChildren(sp<Layer>::fromExisting(this), clonedLayersMap);

    mClonedChild->updateClonedRelatives(clonedLayersMap);



    for (Layer* root : cloneRootsPendingUpdates) {

        if (clonedLayersMap.find(sp<Layer>::fromExisting(root)) != clonedLayersMap.end()) {

            return false;

        }

    }

    return true;

}



void Layer::updateClonedDrawingState(std::map<sp<Layer>, sp<Layer>>& clonedLayersMap) {
@@ -2764,7 +2772,7 @@ bool Layer::isInternalDisplayOverlay() const { 
void Layer::setClonedChild(const sp<Layer>& clonedChild) {

    mClonedChild = clonedChild;

    mHadClonedChild = true;

    mFlinger->mNumClones++;

    mFlinger->mLayerMirrorRoots.push_back(this);

}



bool Layer::setDropInputMode(gui::DropInputMode mode) {

services/surfaceflinger/Layer.h

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ public: 


    gui::WindowInfo::Type getWindowType() const { return mWindowType; }



    void updateMirrorInfo();

    bool updateMirrorInfo(const std::deque<Layer*>& cloneRootsPendingUpdates);



    /*

     * doTransaction - process the transaction. This is a good place to figure

services/surfaceflinger/LayerRenderArea.cpp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void LayerRenderArea::render(std::function<void()> drawLayers) { 
    // If layer is offscreen, update mirroring info if it exists

    if (mLayer->isRemovedFromCurrentState()) {

        mLayer->traverse(LayerVector::StateSet::Drawing,

                         [&](Layer* layer) { layer->updateMirrorInfo(); });

                         [&](Layer* layer) { layer->updateMirrorInfo({}); });

        mLayer->traverse(LayerVector::StateSet::Drawing,

                         [&](Layer* layer) { layer->updateCloneBufferInfo(); });

    }

services/surfaceflinger/SurfaceFlinger.cpp

+16 −3
Original line number Diff line number Diff line
@@ -4020,8 +4020,21 @@ void SurfaceFlinger::doCommitTransactions() { 
    }



    commitOffscreenLayers();

    if (mNumClones > 0) {

        mDrawingState.traverse([&](Layer* layer) { layer->updateMirrorInfo(); });

    if (mLayerMirrorRoots.size() > 0) {

        std::deque<Layer*> pendingUpdates;

        pendingUpdates.insert(pendingUpdates.end(), mLayerMirrorRoots.begin(),

                              mLayerMirrorRoots.end());

        std::vector<Layer*> needsUpdating;

        for (Layer* cloneRoot : mLayerMirrorRoots) {

            pendingUpdates.pop_front();

            if (cloneRoot->updateMirrorInfo(pendingUpdates)) {

            } else {

                needsUpdating.push_back(cloneRoot);

            }

        }

        for (Layer* cloneRoot : needsUpdating) {

            cloneRoot->updateMirrorInfo({});

        }

    }

}
@@ -4128,7 +4141,7 @@ bool SurfaceFlinger::latchBuffers() { 
        mBootStage = BootStage::BOOTANIMATION;

    }



    if (mNumClones > 0) {

    if (mLayerMirrorRoots.size() > 0) {

        mDrawingState.traverse([&](Layer* layer) { layer->updateCloneBufferInfo(); });

    }

services/surfaceflinger/SurfaceFlinger.h

+1 −2
Original line number Diff line number Diff line
@@ -296,8 +296,7 @@ public: 
    // the client can no longer modify this layer directly.

    void onHandleDestroyed(BBinder* handle, sp<Layer>& layer, uint32_t layerId);



    // TODO: Remove atomic if move dtor to main thread CL lands

    std::atomic<uint32_t> mNumClones;

    std::vector<Layer*> mLayerMirrorRoots;



    TransactionCallbackInvoker& getTransactionCallbackInvoker() {

        return mTransactionCallbackInvoker;