Skip to content

Commit bc60fbc

Browse files
patrickdwilliamspatrickdwilliams
committed
Rename and remove duplicate layer creation functions
Clean up CL for leftovers from the FE refactor. Bug: 238781169 Flag: EXEMPT refactor Test: presubmit Change-Id: I1dc9dbdea93d64c954ed888ba749e28d79b8124b
1 parent 35f9fab commit bc60fbc

7 files changed

Lines changed: 13 additions & 36 deletions

File tree

‎services/surfaceflinger/SurfaceFlinger.cpp‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2609,7 +2609,7 @@ bool SurfaceFlinger::updateLayerSnapshots(VsyncId vsyncId, nsecs_t frameTimeNs,
26092609
for (auto& layer : mLayerLifecycleManager.getLayers()) {
26102610
if (layer->changes.test(frontend::RequestedLayerState::Changes::Created) &&
26112611
layer->bgColorLayer) {
2612-
sp<Layer> bgColorLayer = getFactory().createEffectLayer(
2612+
sp<Layer> bgColorLayer = getFactory().createLayer(
26132613
LayerCreationArgs(this, nullptr, layer->name,
26142614
ISurfaceComposerClient::eFXSurfaceEffect, LayerMetadata(),
26152615
std::make_optional(layer->id), true));
@@ -5428,7 +5428,7 @@ status_t SurfaceFlinger::mirrorLayer(const LayerCreationArgs& args,
54285428
mirrorArgs.flags |= ISurfaceComposerClient::eNoColorFill;
54295429
mirrorArgs.mirrorLayerHandle = mirrorFromHandle;
54305430
mirrorArgs.addToRoot = false;
5431-
status_t result = createEffectLayer(mirrorArgs, &outResult.handle, &mirrorLayer);
5431+
status_t result = createLayer(mirrorArgs, &outResult.handle, &mirrorLayer);
54325432
if (result != NO_ERROR) {
54335433
return result;
54345434
}
@@ -5466,7 +5466,7 @@ status_t SurfaceFlinger::mirrorDisplay(DisplayId displayId, const LayerCreationA
54665466
mirrorArgs.flags |= ISurfaceComposerClient::eNoColorFill;
54675467
mirrorArgs.addToRoot = true;
54685468
mirrorArgs.layerStackToMirror = layerStack;
5469-
result = createEffectLayer(mirrorArgs, &outResult.handle, &rootMirrorLayer);
5469+
result = createLayer(mirrorArgs, &outResult.handle, &rootMirrorLayer);
54705470
if (result != NO_ERROR) {
54715471
return result;
54725472
}
@@ -5492,7 +5492,7 @@ status_t SurfaceFlinger::createLayer(LayerCreationArgs& args, gui::CreateSurface
54925492
args.flags |= ISurfaceComposerClient::eNoColorFill;
54935493
[[fallthrough]];
54945494
case ISurfaceComposerClient::eFXSurfaceEffect: {
5495-
result = createBufferStateLayer(args, &outResult.handle, &layer);
5495+
result = createLayer(args, &outResult.handle, &layer);
54965496
if (result != NO_ERROR) {
54975497
return result;
54985498
}
@@ -5534,22 +5534,12 @@ status_t SurfaceFlinger::createLayer(LayerCreationArgs& args, gui::CreateSurface
55345534
return result;
55355535
}
55365536

5537-
status_t SurfaceFlinger::createBufferStateLayer(LayerCreationArgs& args, sp<IBinder>* handle,
5538-
sp<Layer>* outLayer) {
5537+
status_t SurfaceFlinger::createLayer(const LayerCreationArgs& args, sp<IBinder>* handle,
5538+
sp<Layer>* outLayer) {
55395539
if (checkLayerLeaks() != NO_ERROR) {
55405540
return NO_MEMORY;
55415541
}
5542-
*outLayer = getFactory().createBufferStateLayer(args);
5543-
*handle = (*outLayer)->getHandle();
5544-
return NO_ERROR;
5545-
}
5546-
5547-
status_t SurfaceFlinger::createEffectLayer(const LayerCreationArgs& args, sp<IBinder>* handle,
5548-
sp<Layer>* outLayer) {
5549-
if (checkLayerLeaks() != NO_ERROR) {
5550-
return NO_MEMORY;
5551-
}
5552-
*outLayer = getFactory().createEffectLayer(args);
5542+
*outLayer = getFactory().createLayer(args);
55535543
*handle = (*outLayer)->getHandle();
55545544
return NO_ERROR;
55555545
}

‎services/surfaceflinger/SurfaceFlinger.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -847,11 +847,8 @@ class SurfaceFlinger : public BnSurfaceComposer,
847847
*/
848848
status_t createLayer(LayerCreationArgs& args, gui::CreateSurfaceResult& outResult);
849849

850-
status_t createBufferStateLayer(LayerCreationArgs& args, sp<IBinder>* outHandle,
851-
sp<Layer>* outLayer);
852-
853-
status_t createEffectLayer(const LayerCreationArgs& args, sp<IBinder>* outHandle,
854-
sp<Layer>* outLayer);
850+
status_t createLayer(const LayerCreationArgs& args, sp<IBinder>* outHandle,
851+
sp<Layer>* outLayer);
855852

856853
// Checks if there are layer leaks before creating layer
857854
status_t checkLayerLeaks();

‎services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@ std::unique_ptr<compositionengine::CompositionEngine> DefaultFactory::createComp
7777
return compositionengine::impl::createCompositionEngine();
7878
}
7979

80-
sp<Layer> DefaultFactory::createBufferStateLayer(const LayerCreationArgs& args) {
81-
return sp<Layer>::make(args);
82-
}
83-
84-
sp<Layer> DefaultFactory::createEffectLayer(const LayerCreationArgs& args) {
80+
sp<Layer> DefaultFactory::createLayer(const LayerCreationArgs& args) {
8581
return sp<Layer>::make(args);
8682
}
8783

‎services/surfaceflinger/SurfaceFlingerDefaultFactory.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ class DefaultFactory : public surfaceflinger::Factory {
3939
std::unique_ptr<surfaceflinger::NativeWindowSurface> createNativeWindowSurface(
4040
const sp<IGraphicBufferProducer>&) override;
4141
std::unique_ptr<compositionengine::CompositionEngine> createCompositionEngine() override;
42-
sp<Layer> createBufferStateLayer(const LayerCreationArgs& args) override;
43-
sp<Layer> createEffectLayer(const LayerCreationArgs& args) override;
42+
sp<Layer> createLayer(const LayerCreationArgs& args) override;
4443
sp<LayerFE> createLayerFE(const std::string& layerName, const Layer* owner) override;
4544
std::unique_ptr<FrameTracer> createFrameTracer() override;
4645
std::unique_ptr<frametimeline::FrameTimeline> createFrameTimeline(

‎services/surfaceflinger/SurfaceFlingerFactory.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ class Factory {
8383

8484
virtual std::unique_ptr<compositionengine::CompositionEngine> createCompositionEngine() = 0;
8585

86-
virtual sp<Layer> createBufferStateLayer(const LayerCreationArgs& args) = 0;
87-
virtual sp<Layer> createEffectLayer(const LayerCreationArgs& args) = 0;
86+
virtual sp<Layer> createLayer(const LayerCreationArgs& args) = 0;
8887
virtual sp<LayerFE> createLayerFE(const std::string& layerName, const Layer* owner) = 0;
8988
virtual std::unique_ptr<FrameTracer> createFrameTracer() = 0;
9089
virtual std::unique_ptr<frametimeline::FrameTimeline> createFrameTimeline(

‎services/surfaceflinger/tests/unittests/FpsReporterTest.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ class FpsReporterTest : public testing::Test {
7878
static constexpr uint32_t LAYER_FLAGS = 0;
7979
static constexpr int32_t PRIORITY_UNSET = -1;
8080

81-
sp<Layer> createBufferStateLayer(LayerMetadata metadata);
82-
8381
LayerCreationArgs createArgs(uint32_t id, bool canBeRoot, uint32_t parentId,
8482
LayerMetadata metadata);
8583

‎services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,7 @@ class Factory final : public surfaceflinger::Factory {
121121
return compositionengine::impl::createCompositionEngine();
122122
}
123123

124-
sp<Layer> createBufferStateLayer(const LayerCreationArgs&) override { return nullptr; }
125-
126-
sp<Layer> createEffectLayer(const LayerCreationArgs&) override { return nullptr; }
124+
sp<Layer> createLayer(const LayerCreationArgs&) override { return nullptr; }
127125

128126
sp<LayerFE> createLayerFE(const std::string& layerName, const Layer* /* owner */) override {
129127
return sp<LayerFE>::make(layerName);

0 commit comments

Comments
 (0)