Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Surface: add JNI plumbing for setActiveRect." into jb-dev

Browse Source
This commit is contained in:
Jamie Gennis
2012-04-30 17:13:45 -07:00
committed by Android (Google) Code Review
parent 4c3de54daa b40696cc21
commit 6da9cf7782
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/Surface.java
View File

@@ -510,6 +510,8 @@ public class Surface implements Parcelable {
public native void setFreezeTint(int tint); public native void setFreezeTint(int tint);
/** @hide */ /** @hide */
public native void setFlags(int flags, int mask); public native void setFlags(int flags, int mask);
/** @hide */
public native void setActiveRect(Rect activeRect);

27
core/jni/android_view_Surface.cpp
View File

@@ -345,6 +345,32 @@ static inline SkBitmap::Config convertPixelFormat(PixelFormat format)
} }
} }
static void Surface_setActiveRect(JNIEnv* env, jobject thiz, jobject activeRect)
{
const sp<Surface>& surface(getSurface(env, thiz));
if (!Surface::isValid(surface)) {
doThrowIAE(env);
return;
}
android_native_rect_t nativeRect;
if (activeRect) {
nativeRect.left = env->GetIntField(activeRect, ro.l);
nativeRect.top = env->GetIntField(activeRect, ro.t);
nativeRect.right = env->GetIntField(activeRect, ro.r);
nativeRect.bottom= env->GetIntField(activeRect, ro.b);
} else {
doThrowIAE(env, "activeRect may not be null");
return;
}
int err = native_window_set_active_rect(surface.get(), &nativeRect);
if (err != NO_ERROR) {
doThrowRE(env, String8::format(
"Surface::setActiveRect returned an error: %d", err).string());
}
}
static jobject Surface_lockCanvas(JNIEnv* env, jobject clazz, jobject dirtyRect) static jobject Surface_lockCanvas(JNIEnv* env, jobject clazz, jobject dirtyRect)
{ {
const sp<Surface>& surface(getSurface(env, clazz)); const sp<Surface>& surface(getSurface(env, clazz));
@@ -889,6 +915,7 @@ static JNINativeMethod gSurfaceMethods[] = {
{"readFromParcel", "(Landroid/os/Parcel;)V", (void*)Surface_readFromParcel }, {"readFromParcel", "(Landroid/os/Parcel;)V", (void*)Surface_readFromParcel },
{"writeToParcel", "(Landroid/os/Parcel;I)V", (void*)Surface_writeToParcel }, {"writeToParcel", "(Landroid/os/Parcel;I)V", (void*)Surface_writeToParcel },
{"isConsumerRunningBehind", "()Z", (void*)Surface_isConsumerRunningBehind }, {"isConsumerRunningBehind", "()Z", (void*)Surface_isConsumerRunningBehind },
{"setActiveRect", "(Landroid/graphics/Rect;)V", (void*)Surface_setActiveRect },
}; };
void nativeClassInit(JNIEnv* env, jclass clazz) void nativeClassInit(JNIEnv* env, jclass clazz)