diff options
author | Marco Nelissen <marcone@google.com> | 2010-04-26 17:42:07 -0700 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2010-04-26 17:42:07 -0700 |
commit | 55fb51aa411b574646cc3068ce36e73789b81616 (patch) | |
tree | 65d6dbaafa557891931e8c15034112a3cbd5296f /core/jni/android_view_Surface.cpp | |
parent | 87ac404d6d94a0e38471551ea8d7c615454c9ef5 (diff) | |
parent | 863031983d3b4a0f31b9535123ec97dee55ac8cb (diff) | |
download | frameworks_base-55fb51aa411b574646cc3068ce36e73789b81616.zip frameworks_base-55fb51aa411b574646cc3068ce36e73789b81616.tar.gz frameworks_base-55fb51aa411b574646cc3068ce36e73789b81616.tar.bz2 |
resolved conflicts for merge of 86303198 to kraken
Change-Id: Idd921c7108e4c2cd4a861ee1fb8b43e5d56f8f2f
Diffstat (limited to 'core/jni/android_view_Surface.cpp')
-rw-r--r-- | core/jni/android_view_Surface.cpp | 72 |
1 files changed, 41 insertions, 31 deletions
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 1b922e4..838ef22 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -230,6 +230,15 @@ static void Surface_initParcel(JNIEnv* env, jobject clazz, jobject argParcel) setSurface(env, clazz, rhs); } +static jint Surface_getIdentity(JNIEnv* env, jobject clazz) +{ + const sp<SurfaceControl>& control(getSurfaceControl(env, clazz)); + if (control != 0) return (jint) control->getIdentity(); + const sp<Surface>& surface(getSurface(env, clazz)); + if (surface != 0) return (jint) surface->getIdentity(); + return -1; +} + static void Surface_destroy(JNIEnv* env, jobject clazz, uintptr_t *ostack) { const sp<SurfaceControl>& surface(getSurfaceControl(env, clazz)); @@ -262,14 +271,14 @@ static inline SkBitmap::Config convertPixelFormat(PixelFormat format) we can map to SkBitmap::kARGB_8888_Config, and optionally call bitmap.setIsOpaque(true) on the resulting SkBitmap (as an accelerator) */ - switch (format) { - case PIXEL_FORMAT_RGBX_8888: return SkBitmap::kARGB_8888_Config; + switch (format) { + case PIXEL_FORMAT_RGBX_8888: return SkBitmap::kARGB_8888_Config; case PIXEL_FORMAT_RGBA_8888: return SkBitmap::kARGB_8888_Config; case PIXEL_FORMAT_RGBA_4444: return SkBitmap::kARGB_4444_Config; - case PIXEL_FORMAT_RGB_565: return SkBitmap::kRGB_565_Config; - case PIXEL_FORMAT_A_8: return SkBitmap::kA8_Config; - default: return SkBitmap::kNo_Config; - } + case PIXEL_FORMAT_RGB_565: return SkBitmap::kRGB_565_Config; + case PIXEL_FORMAT_A_8: return SkBitmap::kA8_Config; + default: return SkBitmap::kNo_Config; + } } static jobject Surface_lockCanvas(JNIEnv* env, jobject clazz, jobject dirtyRect) @@ -348,7 +357,7 @@ static jobject Surface_lockCanvas(JNIEnv* env, jobject clazz, jobject dirtyRect) env->SetIntField(dirtyRect, ro.b, bounds.bottom); } - return canvas; + return canvas; } static void Surface_unlockCanvasAndPost( @@ -632,8 +641,8 @@ const char* const kSurfaceClassPathName = "android/view/Surface"; static void nativeClassInit(JNIEnv* env, jclass clazz); static JNINativeMethod gSurfaceSessionMethods[] = { - {"init", "()V", (void*)SurfaceSession_init }, - {"destroy", "()V", (void*)SurfaceSession_destroy }, + {"init", "()V", (void*)SurfaceSession_init }, + {"destroy", "()V", (void*)SurfaceSession_destroy }, {"kill", "()V", (void*)SurfaceSession_kill }, }; @@ -641,43 +650,44 @@ static JNINativeMethod gSurfaceMethods[] = { {"nativeClassInit", "()V", (void*)nativeClassInit }, {"init", "(Landroid/view/SurfaceSession;ILjava/lang/String;IIIII)V", (void*)Surface_init }, {"init", "(Landroid/os/Parcel;)V", (void*)Surface_initParcel }, + {"getIdentity", "()I", (void*)Surface_getIdentity }, {"destroy", "()V", (void*)Surface_destroy }, {"release", "()V", (void*)Surface_release }, - {"copyFrom", "(Landroid/view/Surface;)V", (void*)Surface_copyFrom }, - {"isValid", "()Z", (void*)Surface_isValid }, - {"lockCanvasNative", "(Landroid/graphics/Rect;)Landroid/graphics/Canvas;", (void*)Surface_lockCanvas }, - {"unlockCanvasAndPost", "(Landroid/graphics/Canvas;)V", (void*)Surface_unlockCanvasAndPost }, - {"unlockCanvas", "(Landroid/graphics/Canvas;)V", (void*)Surface_unlockCanvas }, - {"openTransaction", "()V", (void*)Surface_openTransaction }, + {"copyFrom", "(Landroid/view/Surface;)V", (void*)Surface_copyFrom }, + {"isValid", "()Z", (void*)Surface_isValid }, + {"lockCanvasNative", "(Landroid/graphics/Rect;)Landroid/graphics/Canvas;", (void*)Surface_lockCanvas }, + {"unlockCanvasAndPost", "(Landroid/graphics/Canvas;)V", (void*)Surface_unlockCanvasAndPost }, + {"unlockCanvas", "(Landroid/graphics/Canvas;)V", (void*)Surface_unlockCanvas }, + {"openTransaction", "()V", (void*)Surface_openTransaction }, {"closeTransaction", "()V", (void*)Surface_closeTransaction }, {"setOrientation", "(III)V", (void*)Surface_setOrientation }, {"freezeDisplay", "(I)V", (void*)Surface_freezeDisplay }, {"unfreezeDisplay", "(I)V", (void*)Surface_unfreezeDisplay }, {"setLayer", "(I)V", (void*)Surface_setLayer }, - {"setPosition", "(II)V",(void*)Surface_setPosition }, - {"setSize", "(II)V",(void*)Surface_setSize }, - {"hide", "()V", (void*)Surface_hide }, - {"show", "()V", (void*)Surface_show }, - {"freeze", "()V", (void*)Surface_freeze }, - {"unfreeze", "()V", (void*)Surface_unfreeze }, - {"setFlags", "(II)V",(void*)Surface_setFlags }, - {"setTransparentRegionHint","(Landroid/graphics/Region;)V", (void*)Surface_setTransparentRegion }, - {"setAlpha", "(F)V", (void*)Surface_setAlpha }, - {"setMatrix", "(FFFF)V", (void*)Surface_setMatrix }, - {"setFreezeTint", "(I)V", (void*)Surface_setFreezeTint }, - {"readFromParcel", "(Landroid/os/Parcel;)V", (void*)Surface_readFromParcel }, - {"writeToParcel", "(Landroid/os/Parcel;I)V", (void*)Surface_writeToParcel }, + {"setPosition", "(II)V",(void*)Surface_setPosition }, + {"setSize", "(II)V",(void*)Surface_setSize }, + {"hide", "()V", (void*)Surface_hide }, + {"show", "()V", (void*)Surface_show }, + {"freeze", "()V", (void*)Surface_freeze }, + {"unfreeze", "()V", (void*)Surface_unfreeze }, + {"setFlags", "(II)V",(void*)Surface_setFlags }, + {"setTransparentRegionHint","(Landroid/graphics/Region;)V", (void*)Surface_setTransparentRegion }, + {"setAlpha", "(F)V", (void*)Surface_setAlpha }, + {"setMatrix", "(FFFF)V", (void*)Surface_setMatrix }, + {"setFreezeTint", "(I)V", (void*)Surface_setFreezeTint }, + {"readFromParcel", "(Landroid/os/Parcel;)V", (void*)Surface_readFromParcel }, + {"writeToParcel", "(Landroid/os/Parcel;I)V", (void*)Surface_writeToParcel }, }; void nativeClassInit(JNIEnv* env, jclass clazz) { so.surface = env->GetFieldID(clazz, ANDROID_VIEW_SURFACE_JNI_ID, "I"); so.surfaceControl = env->GetFieldID(clazz, "mSurfaceControl", "I"); - so.saveCount = env->GetFieldID(clazz, "mSaveCount", "I"); - so.canvas = env->GetFieldID(clazz, "mCanvas", "Landroid/graphics/Canvas;"); + so.saveCount = env->GetFieldID(clazz, "mSaveCount", "I"); + so.canvas = env->GetFieldID(clazz, "mCanvas", "Landroid/graphics/Canvas;"); jclass surfaceSession = env->FindClass("android/view/SurfaceSession"); - sso.client = env->GetFieldID(surfaceSession, "mClient", "I"); + sso.client = env->GetFieldID(surfaceSession, "mClient", "I"); jclass canvas = env->FindClass("android/graphics/Canvas"); no.native_canvas = env->GetFieldID(canvas, "mNativeCanvas", "I"); |