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

Commit d908822d authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "clean-up dead-code" into kraken

parents a950aa84 7d1508b8

libs/surfaceflinger/LayerBase.cpp

+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ namespace android { 
LayerBase::LayerBase(SurfaceFlinger* flinger, DisplayID display)

    : dpy(display), contentDirty(false),

      mFlinger(flinger),

      mTransformed(false),

      mNeedsFiltering(false),

      mOrientation(0),

      mLeft(0), mTop(0),
@@ -259,7 +258,6 @@ void LayerBase::validateVisibility(const Transform& planeTransform) 
    // cache a few things...

    mOrientation = tr.getOrientation();

    mTransformedBounds = tr.makeBounds(w, h);

    mTransformed = transformed;

    mLeft = tr.tx();

    mTop  = tr.ty();

}

libs/surfaceflinger/LayerBase.h

+0 −6
Original line number Diff line number Diff line
@@ -181,11 +181,6 @@ public: 
     */

    virtual bool needsFiltering() const { return mNeedsFiltering; }



    /**

     * transformed -- true is this surface needs a to be transformed

     */

    virtual bool transformed() const    { return mTransformed; }



    /**

     * isSecure - true if this surface is secure, that is if it prevents

     * screenshots or VNC servers.
@@ -236,7 +231,6 @@ protected: 
                uint32_t        mFlags;



                // cached during validateVisibility()

                bool            mTransformed;

                bool            mNeedsFiltering;

                int32_t         mOrientation;

                GLfloat         mVertices[4][2];

libs/surfaceflinger/LayerBuffer.cpp

+0 −16
Original line number Diff line number Diff line
@@ -143,14 +143,6 @@ void LayerBuffer::onDraw(const Region& clip) const 
    }

}



bool LayerBuffer::transformed() const

{

    sp<Source> source(getSource());

    if (LIKELY(source != 0))

        return source->transformed();

    return false;

}



void LayerBuffer::serverDestroy()

{

    sp<Source> source(clearSource());
@@ -319,9 +311,6 @@ void LayerBuffer::Source::postBuffer(ssize_t offset) { 
}

void LayerBuffer::Source::unregisterBuffers() {

}

bool LayerBuffer::Source::transformed() const {

    return mLayer.mTransformed; 

}



// ---------------------------------------------------------------------------
@@ -442,11 +431,6 @@ void LayerBuffer::BufferSource::setBuffer(const sp<LayerBuffer::Buffer>& buffer) 
    mBuffer = buffer;

}



bool LayerBuffer::BufferSource::transformed() const

{

    return mBufferHeap.transform ? true : Source::transformed(); 

}



void LayerBuffer::BufferSource::onDraw(const Region& clip) const 

{

    sp<Buffer> ourBuffer(getBuffer());

libs/surfaceflinger/LayerBuffer.h

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ class LayerBuffer : public LayerBaseClient 
        virtual void onVisibilityResolved(const Transform& planeTransform);

        virtual void postBuffer(ssize_t offset);

        virtual void unregisterBuffers();

        virtual bool transformed() const;

        virtual void destroy() { }

    protected:

        LayerBuffer& mLayer;
@@ -66,7 +65,6 @@ public: 
    virtual void onDraw(const Region& clip) const;

    virtual uint32_t doTransaction(uint32_t flags);

    virtual void unlockPageFlip(const Transform& planeTransform, Region& outDirtyRegion);

    virtual bool transformed() const;



    status_t registerBuffers(const ISurface::BufferHeap& buffers);

    void postBuffer(ssize_t offset);
@@ -130,7 +128,6 @@ private: 
        virtual void onDraw(const Region& clip) const;

        virtual void postBuffer(ssize_t offset);

        virtual void unregisterBuffers();

        virtual bool transformed() const;

        virtual void destroy() { }

    private:

        status_t initTempBuffer() const;