am d908822d: Merge "clean-up dead-code" into kraken

This commit is contained in:
Mathias Agopian
2010-05-26 22:21:47 -07:00
committed by Android Git Automerger
4 changed files with 0 additions and 27 deletions

View File

@ -42,7 +42,6 @@ namespace android {
LayerBase::LayerBase(SurfaceFlinger* flinger, DisplayID display) LayerBase::LayerBase(SurfaceFlinger* flinger, DisplayID display)
: dpy(display), contentDirty(false), : dpy(display), contentDirty(false),
mFlinger(flinger), mFlinger(flinger),
mTransformed(false),
mNeedsFiltering(false), mNeedsFiltering(false),
mOrientation(0), mOrientation(0),
mLeft(0), mTop(0), mLeft(0), mTop(0),
@ -259,7 +258,6 @@ void LayerBase::validateVisibility(const Transform& planeTransform)
// cache a few things... // cache a few things...
mOrientation = tr.getOrientation(); mOrientation = tr.getOrientation();
mTransformedBounds = tr.makeBounds(w, h); mTransformedBounds = tr.makeBounds(w, h);
mTransformed = transformed;
mLeft = tr.tx(); mLeft = tr.tx();
mTop = tr.ty(); mTop = tr.ty();
} }

View File

@ -181,11 +181,6 @@ public:
*/ */
virtual bool needsFiltering() const { return mNeedsFiltering; } 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 * isSecure - true if this surface is secure, that is if it prevents
* screenshots or VNC servers. * screenshots or VNC servers.
@ -236,7 +231,6 @@ protected:
uint32_t mFlags; uint32_t mFlags;
// cached during validateVisibility() // cached during validateVisibility()
bool mTransformed;
bool mNeedsFiltering; bool mNeedsFiltering;
int32_t mOrientation; int32_t mOrientation;
GLfloat mVertices[4][2]; GLfloat mVertices[4][2];

View File

@ -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() void LayerBuffer::serverDestroy()
{ {
sp<Source> source(clearSource()); sp<Source> source(clearSource());
@ -319,9 +311,6 @@ void LayerBuffer::Source::postBuffer(ssize_t offset) {
} }
void LayerBuffer::Source::unregisterBuffers() { 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; mBuffer = buffer;
} }
bool LayerBuffer::BufferSource::transformed() const
{
return mBufferHeap.transform ? true : Source::transformed();
}
void LayerBuffer::BufferSource::onDraw(const Region& clip) const void LayerBuffer::BufferSource::onDraw(const Region& clip) const
{ {
sp<Buffer> ourBuffer(getBuffer()); sp<Buffer> ourBuffer(getBuffer());

View File

@ -46,7 +46,6 @@ class LayerBuffer : public LayerBaseClient
virtual void onVisibilityResolved(const Transform& planeTransform); virtual void onVisibilityResolved(const Transform& planeTransform);
virtual void postBuffer(ssize_t offset); virtual void postBuffer(ssize_t offset);
virtual void unregisterBuffers(); virtual void unregisterBuffers();
virtual bool transformed() const;
virtual void destroy() { } virtual void destroy() { }
protected: protected:
LayerBuffer& mLayer; LayerBuffer& mLayer;
@ -66,7 +65,6 @@ public:
virtual void onDraw(const Region& clip) const; virtual void onDraw(const Region& clip) const;
virtual uint32_t doTransaction(uint32_t flags); virtual uint32_t doTransaction(uint32_t flags);
virtual void unlockPageFlip(const Transform& planeTransform, Region& outDirtyRegion); virtual void unlockPageFlip(const Transform& planeTransform, Region& outDirtyRegion);
virtual bool transformed() const;
status_t registerBuffers(const ISurface::BufferHeap& buffers); status_t registerBuffers(const ISurface::BufferHeap& buffers);
void postBuffer(ssize_t offset); void postBuffer(ssize_t offset);
@ -130,7 +128,6 @@ private:
virtual void onDraw(const Region& clip) const; virtual void onDraw(const Region& clip) const;
virtual void postBuffer(ssize_t offset); virtual void postBuffer(ssize_t offset);
virtual void unregisterBuffers(); virtual void unregisterBuffers();
virtual bool transformed() const;
virtual void destroy() { } virtual void destroy() { }
private: private:
status_t initTempBuffer() const; status_t initTempBuffer() const;