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

Commit 659e3dda authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "Fix transparent region tests" into tm-dev am: 81405d48 

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

Change-Id: I1694a0874838d34cb43b015c8137983f7c3870cf
parents da78afc7 81405d48

services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp

+7 −3
Original line number Original line Diff line number Diff line
@@ -1310,7 +1310,8 @@ struct OutputEnsureOutputLayerIfVisibleTest : public testing::Test { 
    static const Region kLowerHalfBoundsNoRotation;

    static const Region kLowerHalfBoundsNoRotation;

    static const Region kFullBounds90Rotation;

    static const Region kFullBounds90Rotation;

    static const Region kTransparentRegionHint;

    static const Region kTransparentRegionHint;

    static const Region kTransparentRegionHint90Rotation;

    static const Region kTransparentRegionHintTwo;

    static const Region kTransparentRegionHintTwo90Rotation;





    StrictMock<OutputPartialMock> mOutput;

    StrictMock<OutputPartialMock> mOutput;

    LayerFESet mGeomSnapshots;

    LayerFESet mGeomSnapshots;
@@ -1329,8 +1330,10 @@ const Region OutputEnsureOutputLayerIfVisibleTest::kLowerHalfBoundsNoRotation = 
const Region OutputEnsureOutputLayerIfVisibleTest::kFullBounds90Rotation =

const Region OutputEnsureOutputLayerIfVisibleTest::kFullBounds90Rotation =

        Region(Rect(0, 0, 200, 100));

        Region(Rect(0, 0, 200, 100));

const Region OutputEnsureOutputLayerIfVisibleTest::kTransparentRegionHint =

const Region OutputEnsureOutputLayerIfVisibleTest::kTransparentRegionHint =

        Region(Rect(0, 0, 100, 100));

const Region OutputEnsureOutputLayerIfVisibleTest::kTransparentRegionHintTwo =

        Region(Rect(25, 20, 50, 75));

        Region(Rect(25, 20, 50, 75));

const Region OutputEnsureOutputLayerIfVisibleTest::kTransparentRegionHint90Rotation =

const Region OutputEnsureOutputLayerIfVisibleTest::kTransparentRegionHintTwo90Rotation =

        Region(Rect(125, 25, 180, 50));

        Region(Rect(125, 25, 180, 50));





TEST_F(OutputEnsureOutputLayerIfVisibleTest, performsGeomLatchBeforeCheckingIfLayerIncluded) {

TEST_F(OutputEnsureOutputLayerIfVisibleTest, performsGeomLatchBeforeCheckingIfLayerIncluded) {
@@ -1787,6 +1790,7 @@ TEST_F(OutputEnsureOutputLayerIfVisibleTest, blockingRegionIsInOutputSpace) { 
    mLayer.layerFEState.contentDirty = true;

    mLayer.layerFEState.contentDirty = true;

    mLayer.layerFEState.compositionType =

    mLayer.layerFEState.compositionType =

            aidl::android::hardware::graphics::composer3::Composition::DISPLAY_DECORATION;

            aidl::android::hardware::graphics::composer3::Composition::DISPLAY_DECORATION;

    mLayer.layerFEState.transparentRegionHint = kTransparentRegionHintTwo;





    mOutput.mState.layerStackSpace.setContent(Rect(0, 0, 300, 200));

    mOutput.mState.layerStackSpace.setContent(Rect(0, 0, 300, 200));

    mOutput.mState.transform = ui::Transform(TR_ROT_90, 200, 300);

    mOutput.mState.transform = ui::Transform(TR_ROT_90, 200, 300);
@@ -1797,7 +1801,7 @@ TEST_F(OutputEnsureOutputLayerIfVisibleTest, blockingRegionIsInOutputSpace) { 
    ensureOutputLayerIfVisible();

    ensureOutputLayerIfVisible();





    EXPECT_THAT(mLayer.outputLayerState.outputSpaceBlockingRegionHint,

    EXPECT_THAT(mLayer.outputLayerState.outputSpaceBlockingRegionHint,

                RegionEq(kTransparentRegionHint90Rotation));

                RegionEq(kTransparentRegionHintTwo90Rotation));

}

}





/*

/*