diff options
author | Robert Carr <racarr@google.com> | 2021-04-08 17:30:52 -0700 |
---|---|---|
committer | Robert Carr <racarr@google.com> | 2021-04-08 17:32:19 -0700 |
commit | 257fdaecb53fdec10dbe187ec523641da21b55cb (patch) | |
tree | d8b2ebe397742d8ea8f32a728dba57fa6bfc71ec /services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp | |
parent | 9432a357af0f0ff4a83d1f9db646450cf162d616 (diff) |
SurfaceFlinger: Remove reparentChildren
No callers left outside of tests.
Bug: 161937501
Test: Existing tests pass
Change-Id: Id5c2b68d1be05fce9f698813d83044b02bb2764d
Diffstat (limited to 'services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp')
-rw-r--r-- | services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp b/services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp index 7e602a29a0..0bb7e31194 100644 --- a/services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp +++ b/services/surfaceflinger/tests/unittests/SetFrameRateTest.cpp @@ -122,7 +122,6 @@ protected: void addChild(sp<Layer> layer, sp<Layer> child); void removeChild(sp<Layer> layer, sp<Layer> child); - void reparentChildren(sp<Layer> layer, sp<Layer> child); void commitTransaction(); TestableSurfaceFlinger mFlinger; @@ -152,10 +151,6 @@ void SetFrameRateTest::removeChild(sp<Layer> layer, sp<Layer> child) { layer.get()->removeChild(child.get()); } -void SetFrameRateTest::reparentChildren(sp<Layer> parent, sp<Layer> newParent) { - parent.get()->reparentChildren(newParent); -} - void SetFrameRateTest::commitTransaction() { for (auto layer : mLayers) { layer->pushPendingState(); @@ -433,41 +428,6 @@ TEST_P(SetFrameRateTest, SetAndGetParentNotInTree) { EXPECT_EQ(FRAME_RATE_NO_VOTE, child2_1->getFrameRateForLayerTree()); } -TEST_P(SetFrameRateTest, SetAndGetReparentChildren) { - EXPECT_CALL(*mMessageQueue, invalidate()).Times(1); - - const auto& layerFactory = GetParam(); - - auto parent = mLayers.emplace_back(layerFactory->createLayer(mFlinger)); - auto parent2 = mLayers.emplace_back(layerFactory->createLayer(mFlinger)); - auto child1 = mLayers.emplace_back(layerFactory->createLayer(mFlinger)); - auto child2 = mLayers.emplace_back(layerFactory->createLayer(mFlinger)); - - addChild(parent, child1); - addChild(child1, child2); - - child2->setFrameRate(FRAME_RATE_VOTE1); - commitTransaction(); - EXPECT_EQ(FRAME_RATE_TREE, parent->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_NO_VOTE, parent2->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_TREE, child1->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_VOTE1, child2->getFrameRateForLayerTree()); - - reparentChildren(parent, parent2); - commitTransaction(); - EXPECT_EQ(FRAME_RATE_NO_VOTE, parent->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_TREE, parent2->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_TREE, child1->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_VOTE1, child2->getFrameRateForLayerTree()); - - child2->setFrameRate(FRAME_RATE_NO_VOTE); - commitTransaction(); - EXPECT_EQ(FRAME_RATE_NO_VOTE, parent->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_NO_VOTE, parent2->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_NO_VOTE, child1->getFrameRateForLayerTree()); - EXPECT_EQ(FRAME_RATE_NO_VOTE, child2->getFrameRateForLayerTree()); -} - INSTANTIATE_TEST_SUITE_P(PerLayerType, SetFrameRateTest, testing::Values(std::make_shared<BufferQueueLayerFactory>(), std::make_shared<BufferStateLayerFactory>(), |