зеркало из https://github.com/mozilla/gecko-dev.git
Death to tabs\!
This commit is contained in:
Родитель
1261245491
Коммит
dfe2d8965b
|
@ -92,7 +92,7 @@ typedef struct JSJCallbacks {
|
||||||
one from a pool of available JSContexts. The implementation of this
|
one from a pool of available JSContexts. The implementation of this
|
||||||
callback can call JSJ_SetDefaultJSContextForJavaThread() to avoid any
|
callback can call JSJ_SetDefaultJSContextForJavaThread() to avoid any
|
||||||
further callbacks of this type for this Java thread. */
|
further callbacks of this type for this Java thread. */
|
||||||
JSContext * (*map_jsj_thread_to_js_context)(JSJavaThreadState *jsj_env,
|
JSContext * (*map_jsj_thread_to_js_context)(JSJavaThreadState *jsj_env,
|
||||||
#ifdef OJI
|
#ifdef OJI
|
||||||
void *java_applet_obj,
|
void *java_applet_obj,
|
||||||
#endif
|
#endif
|
||||||
|
@ -111,7 +111,7 @@ typedef struct JSJCallbacks {
|
||||||
returns the JS "Window" object corresponding to the HTML window that an
|
returns the JS "Window" object corresponding to the HTML window that an
|
||||||
applet is embedded within. More generally, it's a way for Java to get
|
applet is embedded within. More generally, it's a way for Java to get
|
||||||
hold of a JS object that has not been explicitly passed to it. */
|
hold of a JS object that has not been explicitly passed to it. */
|
||||||
JSObject * (*map_java_object_to_js_object)(JNIEnv *jEnv, void *pJavaObject,
|
JSObject * (*map_java_object_to_js_object)(JNIEnv *jEnv, void *pJavaObject,
|
||||||
char **errp);
|
char **errp);
|
||||||
|
|
||||||
/* An interim callback function until the LiveConnect security story is
|
/* An interim callback function until the LiveConnect security story is
|
||||||
|
@ -125,11 +125,11 @@ typedef struct JSJCallbacks {
|
||||||
semantics of JavaScript. It is acceptable for either function pointer
|
semantics of JavaScript. It is acceptable for either function pointer
|
||||||
to be NULL. */
|
to be NULL. */
|
||||||
#ifdef OJI
|
#ifdef OJI
|
||||||
JSBool (*enter_js_from_java)(JNIEnv *jEnv, char **errp, void **pNSIPrincipaArray, int numPrincipals, void *pNSISecurityContext,void* applet_obj);
|
JSBool (*enter_js_from_java)(JNIEnv *jEnv, char **errp, void **pNSIPrincipaArray, int numPrincipals, void *pNSISecurityContext,void* applet_obj);
|
||||||
#else
|
#else
|
||||||
JSBool (*enter_js_from_java)(JNIEnv *jEnv, char **errp);
|
JSBool (*enter_js_from_java)(JNIEnv *jEnv, char **errp);
|
||||||
#endif
|
#endif
|
||||||
void (*exit_js)(JNIEnv *jEnv);
|
void (*exit_js)(JNIEnv *jEnv);
|
||||||
|
|
||||||
/* Most LiveConnect errors are signaled by calling JS_ReportError(), but in
|
/* Most LiveConnect errors are signaled by calling JS_ReportError(), but in
|
||||||
some circumstances, the target JSContext for such errors is not
|
some circumstances, the target JSContext for such errors is not
|
||||||
|
@ -144,7 +144,7 @@ typedef struct JSJCallbacks {
|
||||||
jobject (*get_java_wrapper)(JNIEnv *jEnv, jint jsobject);
|
jobject (*get_java_wrapper)(JNIEnv *jEnv, jint jsobject);
|
||||||
|
|
||||||
/* This allows liveconnect to unwrap a wrapped JSObject that is passed from java to js.
|
/* This allows liveconnect to unwrap a wrapped JSObject that is passed from java to js.
|
||||||
This happens when Java code is passing back to JS an object that it got from JS. */
|
This happens when Java code is passing back to JS an object that it got from JS. */
|
||||||
jint (*unwrap_java_wrapper)(JNIEnv *jEnv, jobject java_wrapper);
|
jint (*unwrap_java_wrapper)(JNIEnv *jEnv, jobject java_wrapper);
|
||||||
|
|
||||||
/* The following set of methods abstract over the JavaVM object. */
|
/* The following set of methods abstract over the JavaVM object. */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче