Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 22 matching lines...) Expand all Loading... | |
33 | 33 |
34 JniEventCallback::JniEventCallback(JNIEnv* env, jobject callbackObject) | 34 JniEventCallback::JniEventCallback(JNIEnv* env, jobject callbackObject) |
35 : JniCallbackBase(env, callbackObject) | 35 : JniCallbackBase(env, callbackObject) |
36 { | 36 { |
37 } | 37 } |
38 | 38 |
39 void JniEventCallback::Callback(AdblockPlus::JsValueList& params) | 39 void JniEventCallback::Callback(AdblockPlus::JsValueList& params) |
40 { | 40 { |
41 JNIEnvAcquire env(GetJavaVM()); | 41 JNIEnvAcquire env(GetJavaVM()); |
42 | 42 |
43 jclass clazz = env->GetObjectClass(GetCallbackObject()); | 43 jmethodID method = env->GetMethodID( |
44 jmethodID method = env->GetMethodID(clazz, "eventCallback", "(Ljava/util/List; )V"); | 44 *JniLocalReference<jclass>(*env, |
Felix Dahlke
2015/02/03 05:22:50
I think I've seen at least three instances of pret
René Jeschke
2015/02/03 13:51:26
Yeah, the first implementation supported this, but
Felix Dahlke
2015/02/04 04:11:50
Good point, yeah.
| |
45 env->GetObjectClass(GetCallbackObject())), | |
46 "eventCallback", "(Ljava/util/List;)V"); | |
45 | 47 |
46 if (method) | 48 if (method) |
47 { | 49 { |
48 jobject jsList = JniJsValueListToArrayList(*env, params); | 50 jobject jsList = JniJsValueListToArrayList(*env, params); |
49 env->CallVoidMethod(GetCallbackObject(), method, jsList); | 51 env->CallVoidMethod(GetCallbackObject(), method, jsList); |
50 } | 52 } |
51 } | 53 } |
52 | 54 |
53 static JNINativeMethod methods[] = | 55 static JNINativeMethod methods[] = |
54 { | 56 { |
55 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, | 57 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, |
56 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } | 58 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } |
57 }; | 59 }; |
58 | 60 |
59 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_EventCallb ack_registerNatives(JNIEnv *env, jclass clazz) | 61 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_EventCallb ack_registerNatives(JNIEnv *env, jclass clazz) |
60 { | 62 { |
61 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); | 63 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); |
62 } | 64 } |
63 | 65 |
OLD | NEW |