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

Commit e4143678 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure FramebufferSurface is initialized via sp<>::make." into main

parents 768635c1 0e00d0b2

services/surfaceflinger/DisplayHardware/FramebufferSurface.h

+6 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ class HWComposer; 


class FramebufferSurface : public ConsumerBase, public compositionengine::DisplaySurface {

public:

    FramebufferSurface(HWComposer& hwc, PhysicalDisplayId displayId,

                       const sp<IGraphicBufferProducer>& producer,

                       const sp<IGraphicBufferConsumer>& consumer, const ui::Size& size,

                       const ui::Size& maxSize);



    virtual status_t beginFrame(bool mustRecompose);

    virtual status_t prepareFrame(CompositionType compositionType);

    virtual status_t advanceFrame(float hdrSdrRatio);
@@ -58,6 +53,12 @@ public: 


private:

    friend class FramebufferSurfaceTest;

    friend class sp<FramebufferSurface>;



    FramebufferSurface(HWComposer& hwc, PhysicalDisplayId displayId,

                       const sp<IGraphicBufferProducer>& producer,

                       const sp<IGraphicBufferConsumer>& consumer, const ui::Size& size,

                       const ui::Size& maxSize);



    void initializeConsumer();