am ad84fa33: am 4d9b822e: get rid of ISurface (75c207ae) · Commits · e / os / android_frameworks_native

include/gui/ISurface.h

deleted100644 → 0

+0 −62

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef ANDROID_GUI_ISURFACE_H
		#define ANDROID_GUI_ISURFACE_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>
		#include <utils/RefBase.h>

		#include <binder/IInterface.h>

		#include <ui/PixelFormat.h>

		namespace android {

		class IGraphicBufferProducer;

		class ISurface : public IInterface
		{
		protected:
		enum {
		GET_SURFACE_TEXTURE = IBinder::FIRST_CALL_TRANSACTION,
		};

		public:
		DECLARE_META_INTERFACE(Surface);

		virtual sp<IGraphicBufferProducer> getSurfaceTexture() const = 0;
		};

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

		class BnSurface : public BnInterface<ISurface>
		{
		public:
		virtual status_t onTransact( uint32_t code,
		const Parcel& data,
		Parcel* reply,
		uint32_t flags = 0);
		};

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

		}; // namespace android

		#endif // ANDROID_GUI_ISURFACE_H

+6 −4

Original line number	Diff line number	Diff line
		@@ -27,11 +27,11 @@

		#include <ui/PixelFormat.h>

		#include <gui/ISurface.h>

		namespace android {
		// ----------------------------------------------------------------------------

		class IGraphicBufferProducer;

		class ISurfaceComposerClient : public IInterface
		{
		public:
		@@ -55,9 +55,11 @@ public:
		/*
		* Requires ACCESS_SURFACE_FLINGER permission
		*/
		virtual sp<ISurface> createSurface(
		virtual status_t createSurface(
		const String8& name, uint32_t w, uint32_t h,
		PixelFormat format, uint32_t flags) = 0;
		PixelFormat format, uint32_t flags,
		sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp) = 0;

		/*
		* Requires ACCESS_SURFACE_FLINGER permission

+6 −4

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@
		#include <ui/PixelFormat.h>
		#include <ui/Region.h>

		#include <gui/ISurface.h>
		#include <gui/ISurfaceComposerClient.h>

		namespace android {
		@@ -46,9 +45,11 @@ public:
		static bool isValid(const sp<SurfaceControl>& surface) {
		return (surface != 0) && surface->isValid();
		}

		bool isValid() {
		return mSurface!=0 && mClient!=0;
		return mHandle!=0 && mClient!=0;
		}

		static bool isSameSurface(
		const sp<SurfaceControl>& lhs, const sp<SurfaceControl>& rhs);

		@@ -82,7 +83,8 @@ private:

		SurfaceControl(
		const sp<SurfaceComposerClient>& client,
		const sp<ISurface>& surface);
		const sp<IBinder>& handle,
		const sp<IGraphicBufferProducer>& gbp);

		~SurfaceControl();

		@@ -90,7 +92,7 @@ private:
		void destroy();

		sp<SurfaceComposerClient> mClient;
		sp<IBinder> mSurface;
		sp<IBinder> mHandle;
		sp<IGraphicBufferProducer> mGraphicBufferProducer;
		mutable Mutex mLock;
		mutable sp<Surface> mSurfaceData;

+0 −1

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@ LOCAL_SRC_FILES:= \
		IGraphicBufferProducer.cpp \
		ISensorEventConnection.cpp \
		ISensorServer.cpp \
		ISurface.cpp \
		ISurfaceComposer.cpp \
		ISurfaceComposerClient.cpp \
		LayerState.cpp \