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

Commit 8954cb78 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Change RenderEngine ownership"

parents ecd23b16 0a525a45

services/surfaceflinger/CompositionEngine/include/compositionengine/CompositionEngine.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public: 
    virtual void setHwComposer(std::unique_ptr<HWComposer>) = 0;



    virtual renderengine::RenderEngine& getRenderEngine() const = 0;

    virtual void setRenderEngine(std::unique_ptr<renderengine::RenderEngine>) = 0;

    virtual void setRenderEngine(renderengine::RenderEngine*) = 0;



    virtual TimeStats& getTimeStats() const = 0;

    virtual void setTimeStats(const std::shared_ptr<TimeStats>&) = 0;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/CompositionEngine.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public: 
    void setHwComposer(std::unique_ptr<HWComposer>) override;



    renderengine::RenderEngine& getRenderEngine() const override;

    void setRenderEngine(std::unique_ptr<renderengine::RenderEngine>) override;

    void setRenderEngine(renderengine::RenderEngine*) override;



    TimeStats& getTimeStats() const override;

    void setTimeStats(const std::shared_ptr<TimeStats>&) override;
@@ -58,7 +58,7 @@ public: 


private:

    std::unique_ptr<HWComposer> mHwComposer;

    std::unique_ptr<renderengine::RenderEngine> mRenderEngine;

    renderengine::RenderEngine* mRenderEngine;

    std::shared_ptr<TimeStats> mTimeStats;

    bool mNeedsAnotherUpdate = false;

    nsecs_t mRefreshStartTime = 0;

services/surfaceflinger/CompositionEngine/include/compositionengine/mock/CompositionEngine.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public: 
    MOCK_METHOD1(setHwComposer, void(std::unique_ptr<HWComposer>));



    MOCK_CONST_METHOD0(getRenderEngine, renderengine::RenderEngine&());

    MOCK_METHOD1(setRenderEngine, void(std::unique_ptr<renderengine::RenderEngine>));

    MOCK_METHOD1(setRenderEngine, void(renderengine::RenderEngine*));



    MOCK_CONST_METHOD0(getTimeStats, TimeStats&());

    MOCK_METHOD1(setTimeStats, void(const std::shared_ptr<TimeStats>&));

services/surfaceflinger/CompositionEngine/src/CompositionEngine.cpp

+3 −3
Original line number Diff line number Diff line
@@ -65,11 +65,11 @@ void CompositionEngine::setHwComposer(std::unique_ptr<HWComposer> hwComposer) { 
}



renderengine::RenderEngine& CompositionEngine::getRenderEngine() const {

    return *mRenderEngine.get();

    return *mRenderEngine;

}



void CompositionEngine::setRenderEngine(std::unique_ptr<renderengine::RenderEngine> renderEngine) {

    mRenderEngine = std::move(renderEngine);

void CompositionEngine::setRenderEngine(renderengine::RenderEngine* renderEngine) {

    mRenderEngine = renderEngine;

}



TimeStats& CompositionEngine::getTimeStats() const {

services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp

+3 −4
Original line number Diff line number Diff line
@@ -62,11 +62,10 @@ TEST_F(CompositionEngineTest, canSetHWComposer) { 
}



TEST_F(CompositionEngineTest, canSetRenderEngine) {

    renderengine::mock::RenderEngine* renderEngine =

            new StrictMock<renderengine::mock::RenderEngine>();

    mEngine.setRenderEngine(std::unique_ptr<renderengine::RenderEngine>(renderEngine));

    auto renderEngine = std::make_unique<StrictMock<renderengine::mock::RenderEngine>>();

    mEngine.setRenderEngine(renderEngine.get());



    EXPECT_EQ(renderEngine, &mEngine.getRenderEngine());

    EXPECT_EQ(renderEngine.get(), &mEngine.getRenderEngine());

}



TEST_F(CompositionEngineTest, canSetTimeStats) {