ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

remove more unused references to ISurface

Browse Source 
Change-Id: I2201f1ca2bb8f203a081d94a0134f798778dfbef
This commit is contained in:
Mathias Agopian 2011-04-05 15:44:20 -07:00
parent 27fd410be4
commit 47d8730a24
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/surfaceflinger/Surface.h
View File

@ -102,10 +102,6 @@ private:
friend class Test; friend class Test;
// videoEditor preview classes // videoEditor preview classes
friend class VideoEditorPreviewController; friend class VideoEditorPreviewController;
const sp<ISurface>& getISurface() const { return mSurface; }
friend class Surface; friend class Surface;
SurfaceControl( SurfaceControl(
@ -169,6 +165,7 @@ public:
// setSwapRectangle() is intended to be used by GL ES clients // setSwapRectangle() is intended to be used by GL ES clients
void setSwapRectangle(const Rect& r); void setSwapRectangle(const Rect& r);
sp<IBinder> asBinder() const;
private: private:
/* /*
@ -242,7 +239,6 @@ private:
*/ */
void init(); void init();
status_t validate(bool inCancelBuffer = false) const; status_t validate(bool inCancelBuffer = false) const;
sp<ISurface> getISurface() const;
// When the buffer pool is a fixed size we want to make sure SurfaceFlinger // When the buffer pool is a fixed size we want to make sure SurfaceFlinger
// won't stall clients, so we require an extra buffer. // won't stall clients, so we require an extra buffer.

4
libs/gui/Surface.cpp
View File

@ -502,8 +502,8 @@ status_t Surface::validate(bool inCancelBuffer) const
return NO_ERROR; return NO_ERROR;
} }
sp<ISurface> Surface::getISurface() const { sp<IBinder> Surface::asBinder() const {
return mSurface; return mSurface!=0 ? mSurface->asBinder() : 0;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

7
services/surfaceflinger/tests/resize/resize.cpp
View File

@ -29,13 +29,6 @@
using namespace android; using namespace android;
namespace android { namespace android {
class Test {
public:
static const sp<ISurface>& getISurface(const sp<Surface>& s) {
return s->getISurface();
}
};
};
int main(int argc, char** argv) int main(int argc, char** argv)
{ {