Merge "remove dependency on android_native{s_priv|buffer}.h" (638ade9a) · Commits · e / os / android_frameworks_native

include/gui/SurfaceTextureClient.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		#include <gui/ISurfaceTexture.h>
		#include <gui/SurfaceTexture.h>

		#include <ui/egl/android_natives.h>
		#include <ui/ANativeObjectBase.h>
		#include <ui/Region.h>

		#include <utils/RefBase.h>
		@@ -31,7 +31,7 @@ namespace android {
		class Surface;

		class SurfaceTextureClient
		: public EGLNativeBase<ANativeWindow, SurfaceTextureClient, RefBase>
		: public ANativeObjectBase<ANativeWindow, SurfaceTextureClient, RefBase>
		{
		public:
		SurfaceTextureClient(const sp<ISurfaceTexture>& surfaceTexture);

include/private/ui/android_natives_priv.h

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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.
		*/

		#include <ui/android_native_buffer.h>

include/surfaceflinger/Surface.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@

		#include <ui/PixelFormat.h>
		#include <ui/Region.h>
		#include <ui/egl/android_natives.h>

		#include <gui/SurfaceTextureClient.h>

include/ui/egl/android_natives.h→include/ui/ANativeObjectBase.h

+7 −8

Original line number	Diff line number	Diff line
		@@ -22,8 +22,7 @@

		#include <hardware/gralloc.h>
		#include <system/window.h>
		// FIXME: remove this header, it's for legacy use. native_window is pulled from frameworks/base/native/include/android/
		#include <android/native_window.h>

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

		/* FIXME: this is legacy for pixmaps */
		@@ -52,11 +51,11 @@ typedef struct egl_native_pixmap_t
		namespace android {

		/*
		* This helper class turns an EGL android_native_xxx type into a C++
		* This helper class turns a ANativeXXX object type into a C++
		* reference-counted object; with proper type conversions.
		*/
		template <typename NATIVE_TYPE, typename TYPE, typename REF>
		class EGLNativeBase : public NATIVE_TYPE, public REF
		class ANativeObjectBase : public NATIVE_TYPE, public REF
		{
		public:
		// Disambiguate between the incStrong in REF and NATIVE_TYPE
		@@ -68,8 +67,8 @@ public:
		}

		protected:
		typedef EGLNativeBase<NATIVE_TYPE, TYPE, REF> BASE;
		EGLNativeBase() : NATIVE_TYPE(), REF() {
		typedef ANativeObjectBase<NATIVE_TYPE, TYPE, REF> BASE;
		ANativeObjectBase() : NATIVE_TYPE(), REF() {
		NATIVE_TYPE::common.incRef = incRef;
		NATIVE_TYPE::common.decRef = decRef;
		}
		@@ -86,11 +85,11 @@ protected:
		return getSelf(reinterpret_cast<NATIVE_TYPE const*>(base));
		}
		static void incRef(android_native_base_t* base) {
		EGLNativeBase* self = getSelf(base);
		ANativeObjectBase* self = getSelf(base);
		self->incStrong(self);
		}
		static void decRef(android_native_base_t* base) {
		EGLNativeBase* self = getSelf(base);
		ANativeObjectBase* self = getSelf(base);
		self->decStrong(self);
		}
		};

include/ui/EGLNativeSurface.h

deleted100644 → 0

+0 −55

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_EGL_NATIVE_SURFACE_H
		#define ANDROID_EGL_NATIVE_SURFACE_H

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

		#include <cutils/atomic.h>
		#include <utils/RefBase.h>

		#include <EGL/eglnatives.h>

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

		template <class TYPE>
		class EGLNativeSurface : public egl_native_window_t, public LightRefBase<TYPE>
		{
		public:
		EGLNativeSurface() {
		memset(egl_native_window_t::reserved, 0,
		sizeof(egl_native_window_t::reserved));
		memset(egl_native_window_t::reserved_proc, 0,
		sizeof(egl_native_window_t::reserved_proc));
		memset(egl_native_window_t::oem, 0,
		sizeof(egl_native_window_t::oem));
		}
		protected:
		EGLNativeSurface& operator = (const EGLNativeSurface& rhs);
		EGLNativeSurface(const EGLNativeSurface& rhs);
		inline ~EGLNativeSurface() { };
		};

		// ---------------------------------------------------------------------------
		}; // namespace android
		// ---------------------------------------------------------------------------

		#endif // ANDROID_EGL_SURFACE_H