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

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

Merge "Expand the displayFrame for shadows" into sc-dev am: 7629af71 

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

Change-Id: Icc3ad89568791193a5d598c41e7eb46b2a606cc3
parents 58829f0d 7629af71

services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp

+12 −2
Original line number Diff line number Diff line
@@ -216,8 +216,18 @@ Rect OutputLayer::calculateOutputDisplayFrame() const { 


    // reduce uses a FloatRect to provide more accuracy during the

    // transformation. We then round upon constructing 'frame'.

    Rect frame{

            layerTransform.transform(reduce(layerState.geomLayerBounds, activeTransparentRegion))};

    FloatRect geomLayerBounds = layerState.geomLayerBounds;



    // Some HWCs may clip client composited input to its displayFrame. Make sure

    // that this does not cut off the shadow.

    if (layerState.forceClientComposition && layerState.shadowRadius > 0.0f) {

        const auto outset = layerState.shadowRadius;

        geomLayerBounds.left -= outset;

        geomLayerBounds.top -= outset;

        geomLayerBounds.right += outset;

        geomLayerBounds.bottom += outset;

    }

    Rect frame{layerTransform.transform(reduce(geomLayerBounds, activeTransparentRegion))};

    if (!frame.intersect(outputState.layerStackSpace.content, &frame)) {

        frame.clear();

    }

services/surfaceflinger/CompositionEngine/tests/OutputLayerTest.cpp

+21 −0
Original line number Diff line number Diff line
@@ -324,6 +324,27 @@ TEST_F(OutputLayerDisplayFrameTest, outputTransformAffectsDisplayFrame) { 
    EXPECT_THAT(calculateOutputDisplayFrame(), expected);

}



TEST_F(OutputLayerDisplayFrameTest, shadowExpandsDisplayFrame) {

    const int kShadowRadius = 5;

    mLayerFEState.shadowRadius = kShadowRadius;

    mLayerFEState.forceClientComposition = true;



    mLayerFEState.geomLayerBounds = FloatRect{100.f, 100.f, 200.f, 200.f};

    Rect expected{mLayerFEState.geomLayerBounds};

    expected.inset(-kShadowRadius, -kShadowRadius, -kShadowRadius, -kShadowRadius);

    EXPECT_THAT(calculateOutputDisplayFrame(), expected);

}



TEST_F(OutputLayerDisplayFrameTest, shadowExpandsDisplayFrame_onlyIfForcingClientComposition) {

    const int kShadowRadius = 5;

    mLayerFEState.shadowRadius = kShadowRadius;

    mLayerFEState.forceClientComposition = false;



    mLayerFEState.geomLayerBounds = FloatRect{100.f, 100.f, 200.f, 200.f};

    Rect expected{mLayerFEState.geomLayerBounds};

    EXPECT_THAT(calculateOutputDisplayFrame(), expected);

}



/*

 * OutputLayer::calculateOutputRelativeBufferTransform()

 */