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

Commit bc60fbc9 authored by Patrick Williams's avatar Patrick Williams
Browse files

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
parent 35f9fab0

services/surfaceflinger/SurfaceFlinger.cpp

+7 −17
Original line number Diff line number Diff line
@@ -2609,7 +2609,7 @@ bool SurfaceFlinger::updateLayerSnapshots(VsyncId vsyncId, nsecs_t frameTimeNs, 
    for (auto& layer : mLayerLifecycleManager.getLayers()) {

        if (layer->changes.test(frontend::RequestedLayerState::Changes::Created) &&

            layer->bgColorLayer) {

            sp<Layer> bgColorLayer = getFactory().createEffectLayer(

            sp<Layer> bgColorLayer = getFactory().createLayer(

                    LayerCreationArgs(this, nullptr, layer->name,

                                      ISurfaceComposerClient::eFXSurfaceEffect, LayerMetadata(),

                                      std::make_optional(layer->id), true));
@@ -5428,7 +5428,7 @@ status_t SurfaceFlinger::mirrorLayer(const LayerCreationArgs& args, 
        mirrorArgs.flags |= ISurfaceComposerClient::eNoColorFill;

        mirrorArgs.mirrorLayerHandle = mirrorFromHandle;

        mirrorArgs.addToRoot = false;

        status_t result = createEffectLayer(mirrorArgs, &outResult.handle, &mirrorLayer);

        status_t result = createLayer(mirrorArgs, &outResult.handle, &mirrorLayer);

        if (result != NO_ERROR) {

            return result;

        }
@@ -5466,7 +5466,7 @@ status_t SurfaceFlinger::mirrorDisplay(DisplayId displayId, const LayerCreationA 
        mirrorArgs.flags |= ISurfaceComposerClient::eNoColorFill;

        mirrorArgs.addToRoot = true;

        mirrorArgs.layerStackToMirror = layerStack;

        result = createEffectLayer(mirrorArgs, &outResult.handle, &rootMirrorLayer);

        result = createLayer(mirrorArgs, &outResult.handle, &rootMirrorLayer);

        if (result != NO_ERROR) {

            return result;

        }
@@ -5492,7 +5492,7 @@ status_t SurfaceFlinger::createLayer(LayerCreationArgs& args, gui::CreateSurface 
            args.flags |= ISurfaceComposerClient::eNoColorFill;

            [[fallthrough]];

        case ISurfaceComposerClient::eFXSurfaceEffect: {

            result = createBufferStateLayer(args, &outResult.handle, &layer);

            result = createLayer(args, &outResult.handle, &layer);

            if (result != NO_ERROR) {

                return result;

            }
@@ -5534,22 +5534,12 @@ status_t SurfaceFlinger::createLayer(LayerCreationArgs& args, gui::CreateSurface 
    return result;

}



status_t SurfaceFlinger::createBufferStateLayer(LayerCreationArgs& args, sp<IBinder>* handle,

status_t SurfaceFlinger::createLayer(const LayerCreationArgs& args, sp<IBinder>* handle,

                                     sp<Layer>* outLayer) {

    if (checkLayerLeaks() != NO_ERROR) {

        return NO_MEMORY;

    }

    *outLayer = getFactory().createBufferStateLayer(args);

    *handle = (*outLayer)->getHandle();

    return NO_ERROR;

}



status_t SurfaceFlinger::createEffectLayer(const LayerCreationArgs& args, sp<IBinder>* handle,

                                           sp<Layer>* outLayer) {

    if (checkLayerLeaks() != NO_ERROR) {

        return NO_MEMORY;

    }

    *outLayer = getFactory().createEffectLayer(args);

    *outLayer = getFactory().createLayer(args);

    *handle = (*outLayer)->getHandle();

    return NO_ERROR;

}

services/surfaceflinger/SurfaceFlinger.h

+2 −5
Original line number Diff line number Diff line
@@ -847,10 +847,7 @@ private: 
     */

    status_t createLayer(LayerCreationArgs& args, gui::CreateSurfaceResult& outResult);



    status_t createBufferStateLayer(LayerCreationArgs& args, sp<IBinder>* outHandle,

                                    sp<Layer>* outLayer);



    status_t createEffectLayer(const LayerCreationArgs& args, sp<IBinder>* outHandle,

    status_t createLayer(const LayerCreationArgs& args, sp<IBinder>* outHandle,

                         sp<Layer>* outLayer);



    // Checks if there are layer leaks before creating layer

services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp

+1 −5
Original line number Diff line number Diff line
@@ -77,11 +77,7 @@ std::unique_ptr<compositionengine::CompositionEngine> DefaultFactory::createComp 
    return compositionengine::impl::createCompositionEngine();

}



sp<Layer> DefaultFactory::createBufferStateLayer(const LayerCreationArgs& args) {

    return sp<Layer>::make(args);

}



sp<Layer> DefaultFactory::createEffectLayer(const LayerCreationArgs& args) {

sp<Layer> DefaultFactory::createLayer(const LayerCreationArgs& args) {

    return sp<Layer>::make(args);

}

services/surfaceflinger/SurfaceFlingerDefaultFactory.h

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ public: 
    std::unique_ptr<surfaceflinger::NativeWindowSurface> createNativeWindowSurface(

            const sp<IGraphicBufferProducer>&) override;

    std::unique_ptr<compositionengine::CompositionEngine> createCompositionEngine() override;

    sp<Layer> createBufferStateLayer(const LayerCreationArgs& args) override;

    sp<Layer> createEffectLayer(const LayerCreationArgs& args) override;

    sp<Layer> createLayer(const LayerCreationArgs& args) override;

    sp<LayerFE> createLayerFE(const std::string& layerName, const Layer* owner) override;

    std::unique_ptr<FrameTracer> createFrameTracer() override;

    std::unique_ptr<frametimeline::FrameTimeline> createFrameTimeline(

services/surfaceflinger/SurfaceFlingerFactory.h

+1 −2
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ public: 


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



    virtual sp<Layer> createBufferStateLayer(const LayerCreationArgs& args) = 0;

    virtual sp<Layer> createEffectLayer(const LayerCreationArgs& args) = 0;

    virtual sp<Layer> createLayer(const LayerCreationArgs& args) = 0;

    virtual sp<LayerFE> createLayerFE(const std::string& layerName, const Layer* owner) = 0;

    virtual std::unique_ptr<FrameTracer> createFrameTracer() = 0;

    virtual std::unique_ptr<frametimeline::FrameTimeline> createFrameTimeline(