diff options
author | Mathias Agopian <mathias@google.com> | 2010-05-26 22:19:19 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2010-05-26 22:19:19 -0700 |
commit | dc7a80f07aa046925313cf8f6e94feaa16387fda (patch) | |
tree | d4138b277aa7ec2db8db4f8263e7e0d79e16cdef /libs/surfaceflinger | |
parent | a7f669256f93a593c723f05784ef04d3c7d052bb (diff) | |
download | frameworks_native-dc7a80f07aa046925313cf8f6e94feaa16387fda.zip frameworks_native-dc7a80f07aa046925313cf8f6e94feaa16387fda.tar.gz frameworks_native-dc7a80f07aa046925313cf8f6e94feaa16387fda.tar.bz2 |
clean-up dead-code
Diffstat (limited to 'libs/surfaceflinger')
-rw-r--r-- | libs/surfaceflinger/LayerBase.cpp | 2 | ||||
-rw-r--r-- | libs/surfaceflinger/LayerBase.h | 6 | ||||
-rw-r--r-- | libs/surfaceflinger/LayerBuffer.cpp | 16 | ||||
-rw-r--r-- | libs/surfaceflinger/LayerBuffer.h | 3 |
4 files changed, 0 insertions, 27 deletions
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp index 79aaa77..ebce711 100644 --- a/libs/surfaceflinger/LayerBase.cpp +++ b/libs/surfaceflinger/LayerBase.cpp @@ -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(); } diff --git a/libs/surfaceflinger/LayerBase.h b/libs/surfaceflinger/LayerBase.h index 6d7859a..9129e80 100644 --- a/libs/surfaceflinger/LayerBase.h +++ b/libs/surfaceflinger/LayerBase.h @@ -182,11 +182,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]; diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp index 1fc982c..740b8cd 100644 --- a/libs/surfaceflinger/LayerBuffer.cpp +++ b/libs/surfaceflinger/LayerBuffer.cpp @@ -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()); diff --git a/libs/surfaceflinger/LayerBuffer.h b/libs/surfaceflinger/LayerBuffer.h index 869c74f..d38dde2 100644 --- a/libs/surfaceflinger/LayerBuffer.h +++ b/libs/surfaceflinger/LayerBuffer.h @@ -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; |