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

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

Merge "[sf] Update snapshots after screenshots" into udc-dev am: 39fcb504... 

Merge "[sf] Update snapshots after screenshots" into udc-dev am: 39fcb504 am: a482b289 am: a0ec532d

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



Change-Id: I7726817a21f39571c58c817f88457097dcb68fc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7385a894 a0ec532d

services/surfaceflinger/Layer.h

+1 −2
Original line number Diff line number Diff line
@@ -877,6 +877,7 @@ public: 
    // TODO(b/238781169) Remove direct calls to RenderEngine::drawLayers that don't go through

    // CompositionEngine to create a single path for composing layers.

    void updateSnapshot(bool updateGeometry);

    void updateChildrenSnapshots(bool updateGeometry);

    void updateMetadataSnapshot(const LayerMetadata& parentMetadata);

    void updateRelativeMetadataSnapshot(const LayerMetadata& relativeLayerMetadata,

                                        std::unordered_set<Layer*>& visited);
@@ -1134,8 +1135,6 @@ private: 


    bool hasSomethingToDraw() const { return hasEffect() || hasBufferOrSidebandStream(); }



    void updateChildrenSnapshots(bool updateGeometry);



    // Fills the provided vector with the currently available JankData and removes the processed

    // JankData from the pending list.

    void transferAvailableJankData(const std::deque<sp<CallbackHandle>>& handles,

services/surfaceflinger/LayerRenderArea.cpp

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ void LayerRenderArea::render(std::function<void()> drawLayers) { 
            mLayer->setChildrenDrawingParent(mLayer);

        }

    }

    mLayer->updateSnapshot(/*updateGeometry=*/true);

    mLayer->updateChildrenSnapshots(/*updateGeometry=*/true);

}



} // namespace android