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

Commit f40f4ce1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CachedSet::append: remove mHolePunchLayer" into sc-dev am: 160a952f 

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

Change-Id: Ia567c84270aae82922e4599fb14692869583fea6
parents ee1f098b 160a952f

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public: 
        mOutputDataspace = ui::Dataspace::UNKNOWN;

        mDrawFence = nullptr;

        mBlurLayer = nullptr;

        mHolePunchLayer = nullptr;



        mLayers.insert(mLayers.end(), other.mLayers.cbegin(), other.mLayers.cend());

        Region boundingRegion;

services/surfaceflinger/CompositionEngine/tests/planner/CachedSetTest.cpp

+19 −0
Original line number Diff line number Diff line
@@ -607,6 +607,25 @@ TEST_F(CachedSetTest, addHolePunch_noBuffer) { 
    cachedSet.render(mRenderEngine, mOutputState);

}



TEST_F(CachedSetTest, append_removesHolePunch) {

    mTestLayers[0]->outputLayerCompositionState.displayFrame = Rect(0, 0, 5, 5);

    mTestLayers[0]->layerFECompositionState.isOpaque = true;

    CachedSet::Layer& layer1 = *mTestLayers[0]->cachedSetLayer.get();

    CachedSet::Layer& layer2 = *mTestLayers[1]->cachedSetLayer.get();

    CachedSet::Layer& layer3 = *mTestLayers[2]->cachedSetLayer.get();



    CachedSet cachedSet(layer1);

    cachedSet.addLayer(layer2.getState(), kStartTime + 10ms);



    cachedSet.addHolePunchLayerIfFeasible(layer3, false);



    ASSERT_EQ(&mTestLayers[2]->outputLayer, cachedSet.getHolePunchLayer());



    CachedSet cachedSet3(layer3);

    cachedSet.append(cachedSet3);

    ASSERT_EQ(nullptr, cachedSet.getHolePunchLayer());

}



TEST_F(CachedSetTest, decompose_removesHolePunch) {

    mTestLayers[0]->outputLayerCompositionState.displayFrame = Rect(0, 0, 5, 5);

    CachedSet::Layer& layer1 = *mTestLayers[0]->cachedSetLayer.get();