remove more unused references to ISurface (47d8730a) · Commits · e / os / android_frameworks_native

include/surfaceflinger/Surface.h

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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.

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

	// ----------------------------------------------------------------------------		// ----------------------------------------------------------------------------

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -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)
	{		{