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

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

Merge "CE: Cleanups for conversion warnings"

parents a961e117 0a456231

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

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public: 
    virtual void setCompositionEnabled(bool) = 0;



    // Sets the projection state to use

    virtual void setProjection(const ui::Transform&, int32_t orientation, const Rect& frame,

    virtual void setProjection(const ui::Transform&, uint32_t orientation, const Rect& frame,

                               const Rect& viewport, const Rect& scissor, bool needsFiltering) = 0;

    // Sets the bounds to use

    virtual void setBounds(const ui::Size&) = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public: 
    bool isValid() const override;

    std::optional<DisplayId> getDisplayId() const override;

    void setCompositionEnabled(bool) override;

    void setProjection(const ui::Transform&, int32_t orientation, const Rect& frame,

    void setProjection(const ui::Transform&, uint32_t orientation, const Rect& frame,

                       const Rect& viewport, const Rect& scissor, bool needsFiltering) override;

    void setBounds(const ui::Size&) override;

    void setLayerStackFilter(uint32_t layerStackId, bool isInternal) override;

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public: 


    MOCK_METHOD1(setCompositionEnabled, void(bool));

    MOCK_METHOD6(setProjection,

                 void(const ui::Transform&, int32_t, const Rect&, const Rect&, const Rect&, bool));

                 void(const ui::Transform&, uint32_t, const Rect&, const Rect&, const Rect&, bool));

    MOCK_METHOD1(setBounds, void(const ui::Size&));

    MOCK_METHOD2(setLayerStackFilter, void(uint32_t, bool));

services/surfaceflinger/CompositionEngine/src/HwcBufferCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ void HwcBufferCache::getHwcBuffer(int slot, const sp<GraphicBuffer>& buffer, uin 
        slot >= BufferQueue::NUM_BUFFER_SLOTS) {

        *outSlot = 0;

    } else {

        *outSlot = slot;

        *outSlot = static_cast<uint32_t>(slot);

    }



    auto& currentBuffer = mBuffers[*outSlot];

services/surfaceflinger/CompositionEngine/src/Output.cpp

+3 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void Output::setCompositionEnabled(bool enabled) { 
    dirtyEntireOutput();

}



void Output::setProjection(const ui::Transform& transform, int32_t orientation, const Rect& frame,

void Output::setProjection(const ui::Transform& transform, uint32_t orientation, const Rect& frame,

                           const Rect& viewport, const Rect& scissor, bool needsFiltering) {

    auto& outputState = editState();

    outputState.transform = transform;
@@ -433,7 +433,7 @@ void Output::ensureOutputLayerIfVisible(std::shared_ptr<compositionengine::Layer 
    if (layerFEState.shadowRadius > 0.0f) {

        // if the layer casts a shadow, offset the layers visible region and

        // calculate the shadow region.

        const int32_t inset = layerFEState.shadowRadius * -1.0f;

        const auto inset = static_cast<int32_t>(ceilf(layerFEState.shadowRadius) * -1.0f);

        Rect visibleRectWithShadows(visibleRect);

        visibleRectWithShadows.inset(inset, inset, inset, inset);

        visibleRegion.set(visibleRectWithShadows);
@@ -457,7 +457,7 @@ void Output::ensureOutputLayerIfVisible(std::shared_ptr<compositionengine::Layer 
    }



    // compute the opaque region

    const int32_t layerOrientation = tr.getOrientation();

    const auto layerOrientation = tr.getOrientation();

    if (layerFEState.isOpaque && ((layerOrientation & ui::Transform::ROT_INVALID) == 0)) {

        // If we one of the simple category of transforms (0/90/180/270 rotation

        // + any flip), then the opaque region is the layer's footprint.