diff options
| author | Andy McFadden <fadden@android.com> | 2012-12-18 09:48:38 -0800 |
|---|---|---|
| committer | Andy McFadden <fadden@android.com> | 2012-12-18 11:22:21 -0800 |
| commit | d47f7d8b5fe3a3861d7cbdc5f912235407823c8e (patch) | |
| tree | b4c4e636bac379ded38550ade39e39c2d86467ea /include | |
| parent | 4e7ec240cabbdf3ac9776a691be0a46ea4e2e69e (diff) | |
| download | frameworks_base-d47f7d8b5fe3a3861d7cbdc5f912235407823c8e.zip frameworks_base-d47f7d8b5fe3a3861d7cbdc5f912235407823c8e.tar.gz frameworks_base-d47f7d8b5fe3a3861d7cbdc5f912235407823c8e.tar.bz2 | |
Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.
Bug 7736700
Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
Diffstat (limited to 'include')
| -rw-r--r-- | include/android_runtime/android_graphics_SurfaceTexture.h | 6 | ||||
| -rw-r--r-- | include/android_runtime/android_view_Surface.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/android_runtime/android_graphics_SurfaceTexture.h b/include/android_runtime/android_graphics_SurfaceTexture.h index badf22c..77ccd2a 100644 --- a/include/android_runtime/android_graphics_SurfaceTexture.h +++ b/include/android_runtime/android_graphics_SurfaceTexture.h @@ -23,14 +23,14 @@ namespace android { -class SurfaceTexture; +class GLConsumer; extern sp<ANativeWindow> android_SurfaceTexture_getNativeWindow( JNIEnv* env, jobject thiz); extern bool android_SurfaceTexture_isInstanceOf(JNIEnv* env, jobject thiz); -/* Gets the underlying SurfaceTexture from a SurfaceTexture Java object. */ -extern sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz); +/* Gets the underlying GLConsumer from a SurfaceTexture Java object. */ +extern sp<GLConsumer> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz); } // namespace android diff --git a/include/android_runtime/android_view_Surface.h b/include/android_runtime/android_view_Surface.h index df0fe72..b56aff8 100644 --- a/include/android_runtime/android_view_Surface.h +++ b/include/android_runtime/android_view_Surface.h @@ -24,7 +24,7 @@ namespace android { class Surface; -class ISurfaceTexture; +class IGraphicBufferProducer; /* Gets the underlying ANativeWindow for a Surface. */ extern sp<ANativeWindow> android_view_Surface_getNativeWindow( @@ -36,9 +36,9 @@ extern bool android_view_Surface_isInstanceOf(JNIEnv* env, jobject obj); /* Gets the underlying Surface from a Surface Java object. */ extern sp<Surface> android_view_Surface_getSurface(JNIEnv* env, jobject surfaceObj); -/* Creates a Surface from an ISurfaceTexture. */ +/* Creates a Surface from an IGraphicBufferProducer. */ extern jobject android_view_Surface_createFromISurfaceTexture(JNIEnv* env, - const sp<ISurfaceTexture>& surfaceTexture); + const sp<IGraphicBufferProducer>& bufferProducer); } // namespace android |