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

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

Merge "SurfaceFlinger: Remove the duty of ColorLayer in computeCrop"

parents d205fc93 f6833405

services/surfaceflinger/ColorLayer.h

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ public: 
    bool isVisible() const override;



    void setPerFrameData(const sp<const DisplayDevice>& display) override;



protected:

    FloatRect computeCrop(const sp<const DisplayDevice>& /*display*/) const override { return {}; }

};



} // namespace android

services/surfaceflinger/Layer.h

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ protected: 


    uint32_t getEffectiveUsage(uint32_t usage) const;



    FloatRect computeCrop(const sp<const DisplayDevice>& display) const;

    virtual FloatRect computeCrop(const sp<const DisplayDevice>& display) const;

    // Compute the initial crop as specified by parent layers and the

    // SurfaceControl for this layer. Does not include buffer crop from the

    // IGraphicBufferProducer client, as that should not affect child clipping.